Merge "docs: start a release document"
diff --git a/manifest_xml.py b/manifest_xml.py
index f37732c..23b4fb7 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -135,6 +135,7 @@
self.globalConfig = GitConfig.ForUser()
self.localManifestWarning = False
self.isGitcClient = False
+ self._load_local_manifests = True
self.repoProject = MetaProject(self, 'repo',
gitdir = os.path.join(repodir, 'repo/.git'),
@@ -146,15 +147,26 @@
self._Unload()
- def Override(self, name):
+ def Override(self, name, load_local_manifests=True):
"""Use a different manifest, just for the current instantiation.
"""
- path = os.path.join(self.manifestProject.worktree, name)
- if not os.path.isfile(path):
- raise ManifestParseError('manifest %s not found' % name)
+ path = None
+
+ # Look for a manifest by path in the filesystem (including the cwd).
+ if not load_local_manifests:
+ local_path = os.path.abspath(name)
+ if os.path.isfile(local_path):
+ path = local_path
+
+ # Look for manifests by name from the manifests repo.
+ if path is None:
+ path = os.path.join(self.manifestProject.worktree, name)
+ if not os.path.isfile(path):
+ raise ManifestParseError('manifest %s not found' % name)
old = self.manifestFile
try:
+ self._load_local_manifests = load_local_manifests
self.manifestFile = path
self._Unload()
self._Load()
@@ -435,23 +447,26 @@
nodes.append(self._ParseManifestXml(self.manifestFile,
self.manifestProject.worktree))
- local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
- if os.path.exists(local):
- if not self.localManifestWarning:
- self.localManifestWarning = True
- print('warning: %s is deprecated; put local manifests in `%s` instead'
- % (LOCAL_MANIFEST_NAME, os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
- file=sys.stderr)
- nodes.append(self._ParseManifestXml(local, self.repodir))
+ if self._load_local_manifests:
+ local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME)
+ if os.path.exists(local):
+ if not self.localManifestWarning:
+ self.localManifestWarning = True
+ print('warning: %s is deprecated; put local manifests '
+ 'in `%s` instead' % (LOCAL_MANIFEST_NAME,
+ os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)),
+ file=sys.stderr)
+ nodes.append(self._ParseManifestXml(local, self.repodir))
- local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME))
- try:
- for local_file in sorted(platform_utils.listdir(local_dir)):
- if local_file.endswith('.xml'):
- local = os.path.join(local_dir, local_file)
- nodes.append(self._ParseManifestXml(local, self.repodir))
- except OSError:
- pass
+ local_dir = os.path.abspath(os.path.join(self.repodir,
+ LOCAL_MANIFESTS_DIR_NAME))
+ try:
+ for local_file in sorted(platform_utils.listdir(local_dir)):
+ if local_file.endswith('.xml'):
+ local = os.path.join(local_dir, local_file)
+ nodes.append(self._ParseManifestXml(local, self.repodir))
+ except OSError:
+ pass
try:
self._ParseManifest(nodes)
diff --git a/platform_utils_win32.py b/platform_utils_win32.py
index a643121..7ab2bf0 100644
--- a/platform_utils_win32.py
+++ b/platform_utils_win32.py
@@ -17,7 +17,7 @@
from ctypes import WinDLL, get_last_error, FormatError, WinError, addressof
from ctypes import c_buffer
-from ctypes.wintypes import BOOL, LPCWSTR, DWORD, HANDLE, POINTER, c_ubyte
+from ctypes.wintypes import BOOL, BOOLEAN, LPCWSTR, DWORD, HANDLE, POINTER, c_ubyte
from ctypes.wintypes import WCHAR, USHORT, LPVOID, Structure, Union, ULONG
from ctypes.wintypes import byref
@@ -33,7 +33,7 @@
# Win32 API entry points
CreateSymbolicLinkW = kernel32.CreateSymbolicLinkW
-CreateSymbolicLinkW.restype = BOOL
+CreateSymbolicLinkW.restype = BOOLEAN
CreateSymbolicLinkW.argtypes = (LPCWSTR, # lpSymlinkFileName In
LPCWSTR, # lpTargetFileName In
DWORD) # dwFlags In
@@ -145,19 +145,12 @@
def _create_symlink(source, link_name, dwFlags):
- # Note: Win32 documentation for CreateSymbolicLink is incorrect.
- # On success, the function returns "1".
- # On error, the function returns some random value (e.g. 1280).
- # The best bet seems to use "GetLastError" and check for error/success.
- CreateSymbolicLinkW(link_name, source, dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE)
- code = get_last_error()
- if code != ERROR_SUCCESS:
+ if not CreateSymbolicLinkW(link_name, source, dwFlags | SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE):
# See https://github.com/golang/go/pull/24307/files#diff-b87bc12e4da2497308f9ef746086e4f0
# "the unprivileged create flag is unsupported below Windows 10 (1703, v10.0.14972).
# retry without it."
- CreateSymbolicLinkW(link_name, source, dwFlags)
- code = get_last_error()
- if code != ERROR_SUCCESS:
+ if not CreateSymbolicLinkW(link_name, source, dwFlags):
+ code = get_last_error()
error_desc = FormatError(code).strip()
if code == ERROR_PRIVILEGE_NOT_HELD:
raise OSError(errno.EPERM, error_desc, link_name)
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py
index 751a202..a1e823c 100644
--- a/subcmds/diffmanifests.py
+++ b/subcmds/diffmanifests.py
@@ -190,12 +190,12 @@
self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText
manifest1 = XmlManifest(self.manifest.repodir)
- manifest1.Override(args[0])
+ manifest1.Override(args[0], load_local_manifests=False)
if len(args) == 1:
manifest2 = self.manifest
else:
manifest2 = XmlManifest(self.manifest.repodir)
- manifest2.Override(args[1])
+ manifest2.Override(args[1], load_local_manifests=False)
diff = manifest1.projectsDiff(manifest2)
if opt.raw:
