From 4e1fc1013c9203d3f5e7bdfba909d175a522c1f3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 6 Sep 2020 14:42:47 -0400 Subject: manifest: drop support for local_manifest.xml We deprecated this 8 years ago. Time to drop it to simplify the code as it'll help with refactoring in this module to not migrate it. Change-Id: I2deae5496d1f66a4491408fcdc95cd527062f8b6 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/280798 Tested-by: Mike Frysinger Reviewed-by: Michael Mortensen --- manifest_xml.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'manifest_xml.py') diff --git a/manifest_xml.py b/manifest_xml.py index f546045a..f2d04df2 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -192,7 +192,6 @@ class XmlManifest(object): self.topdir = os.path.dirname(self.repodir) self.manifestFile = os.path.join(self.repodir, MANIFEST_FILE_NAME) self.globalConfig = GitConfig.ForUser() - self.localManifestWarning = False self.isGitcClient = False self._load_local_manifests = True @@ -555,15 +554,12 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md self.manifestProject.worktree)) 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)) + if os.path.exists(os.path.join(self.repodir, LOCAL_MANIFEST_NAME)): + print('error: %s is not supported; put local manifests in `%s`' + 'instead' % (LOCAL_MANIFEST_NAME, + os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)), + file=sys.stderr) + sys.exit(1) local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME)) -- cgit v1.2.3-54-g00ecf