From d82be3e672986cf1b490248a0ae4e6e42ec6fbd3 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 5 Apr 2022 19:30:46 +0000 Subject: Move manifest config logic into ManifestProject Use ManifestProject properties for config values. Change-Id: Ib4ad90b0d9a089916e35615b8058942e6d01dc04 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/334519 Tested-by: LaMont Jones Reviewed-by: Mike Frysinger --- subcmds/init.py | 2 +- subcmds/sync.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'subcmds') diff --git a/subcmds/init.py b/subcmds/init.py index b6c891ac..13085fae 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -345,7 +345,7 @@ to update the working directory files. self._SyncManifest(opt) self._LinkManifest(opt.manifest_name) - if self.manifest.manifestProject.config.GetBoolean('repo.superproject'): + if self.manifest.manifestProject.use_superproject: self._CloneSuperproject(opt) if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror: diff --git a/subcmds/sync.py b/subcmds/sync.py index f5584dc8..c1655159 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -976,7 +976,7 @@ later is required to fix a server side protocol bug. file=sys.stderr) mp = self.manifest.manifestProject - is_standalone_manifest = mp.config.GetString('manifest.standalone') + is_standalone_manifest = bool(mp.standalone_manifest_url) if not is_standalone_manifest: mp.PreSync() -- cgit v1.2.3-54-g00ecf