diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2012-11-22 13:47:16 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-02-17 21:19:58 +0900 |
| commit | 606eab804302a92d232735d4aa57853cf3be3d9a (patch) | |
| tree | 5cc12b737e94b8bc8e1ab84a88c021464b73de3e | |
| parent | cd07cfae1c5c3588ea4a4ca1fb85e208f1aa5b33 (diff) | |
| download | git-repo-606eab804302a92d232735d4aa57853cf3be3d9a.tar.gz | |
Show full path of `local_manifests` folder in deprecation warning
When a local_manifest.xml file is present, a deprecation warning
is printed telling the user to put local manifest files in the
`local_manifests` directory.
Include the full path to the `local_manifests` directory in the
warning, to reduce confusion about where the directory should be
located. Also enclose the directory name in backticks.
Change-Id: I85710cfbd6e77fb2fa6b7b0ce66d77693ccd649f
| -rw-r--r-- | manifest_xml.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 53f33537..e8693ba8 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -335,8 +335,8 @@ class XmlManifest(object): | |||
| 335 | 335 | ||
| 336 | local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) | 336 | local = os.path.join(self.repodir, LOCAL_MANIFEST_NAME) |
| 337 | if os.path.exists(local): | 337 | if os.path.exists(local): |
| 338 | print('warning: %s is deprecated; put local manifests in %s instead' | 338 | print('warning: %s is deprecated; put local manifests in `%s` instead' |
| 339 | % (LOCAL_MANIFEST_NAME, LOCAL_MANIFESTS_DIR_NAME), | 339 | % (LOCAL_MANIFEST_NAME, os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)), |
| 340 | file=sys.stderr) | 340 | file=sys.stderr) |
| 341 | nodes.append(self._ParseManifestXml(local, self.repodir)) | 341 | nodes.append(self._ParseManifestXml(local, self.repodir)) |
| 342 | 342 | ||