From e3315bb49a782bcf62ba9df4fc1c2690b046763f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 9 Feb 2021 23:45:28 -0500 Subject: diffmanifests/sync: simplify repodir lookup We have access to repodir on the command object itself, so we don't need to pull it indirectly out of the manifest object. Change-Id: I8688fb1c84979825efa966dc787e78c6f7ba3823 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/296542 Reviewed-by: Raman Tenneti Tested-by: Mike Frysinger --- subcmds/diffmanifests.py | 4 ++-- subcmds/sync.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'subcmds') diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py index 8ff212ed..392e5972 100644 --- a/subcmds/diffmanifests.py +++ b/subcmds/diffmanifests.py @@ -191,12 +191,12 @@ synced and their revisions won't be found. else: self.printProject = self.printAdded = self.printRemoved = self.printRevision = self.printText - manifest1 = RepoClient(self.manifest.repodir) + manifest1 = RepoClient(self.repodir) manifest1.Override(args[0], load_local_manifests=False) if len(args) == 1: manifest2 = self.manifest else: - manifest2 = RepoClient(self.manifest.repodir) + manifest2 = RepoClient(self.repodir) manifest2.Override(args[1], load_local_manifests=False) diff = manifest1.projectsDiff(manifest2) diff --git a/subcmds/sync.py b/subcmds/sync.py index 5855af55..5020ea7a 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -680,7 +680,7 @@ later is required to fix a server side protocol bug. if project.relpath: new_project_paths.append(project.relpath) file_name = 'project.list' - file_path = os.path.join(self.manifest.repodir, file_name) + file_path = os.path.join(self.repodir, file_name) old_project_paths = [] if os.path.exists(file_path): -- cgit v1.2.3-54-g00ecf