diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2012-11-13 03:04:18 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2012-11-13 08:19:51 +0900 |
commit | 5566ae5ddea409279b13e538b513a73062862c3e (patch) | |
tree | 8eee7a90ecf3692659eb2249c1a7b48c81de28a2 | |
parent | 2d5a0df798b7b16ccf9c17b2435a9640cf0d81c0 (diff) | |
download | git-repo-5566ae5ddea409279b13e538b513a73062862c3e.tar.gz |
Print deprecation warning when local_manifest.xml is used
The preferred way to specify local manifests is to drop the file(s)
in the local_manifests folder. Print a deprecation warning when
the legacy local_manifest.xml file is used.
Change-Id: Ice85bd06fb612d6fcceeaa0755efd130556c4464
-rw-r--r-- | docs/manifest-format.txt | 4 | ||||
-rw-r--r-- | manifest_xml.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/manifest-format.txt b/docs/manifest-format.txt index c51b84be..9589352e 100644 --- a/docs/manifest-format.txt +++ b/docs/manifest-format.txt | |||
@@ -250,4 +250,6 @@ invocation, instructing repo to automatically download and manage | |||
250 | these extra projects. | 250 | these extra projects. |
251 | 251 | ||
252 | Additional remotes and projects may also be added through a local | 252 | Additional remotes and projects may also be added through a local |
253 | manifest, stored in `$TOP_DIR/.repo/local_manifest.xml`. | 253 | manifest, stored in `$TOP_DIR/.repo/local_manifest.xml`. This method |
254 | is deprecated in favor of using multiple manifest files as mentioned | ||
255 | above. | ||
diff --git a/manifest_xml.py b/manifest_xml.py index 4e476791..d16f1a98 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -300,6 +300,8 @@ class XmlManifest(object): | |||
300 | 300 | ||
301 | local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) | 301 | local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) |
302 | if os.path.exists(local): | 302 | if os.path.exists(local): |
303 | print >>sys.stderr, 'warning: %s is deprecated; put local manifests in %s instead' % \ | ||
304 | (LOCAL_MANIFEST_NAME, LOCAL_MANIFESTS_DIR_NAME) | ||
303 | nodes.append(self._ParseManifestXml(local, self.repodir)) | 305 | nodes.append(self._ParseManifestXml(local, self.repodir)) |
304 | 306 | ||
305 | local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)) | 307 | local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)) |