From 037552333182497e9e38bff984de44df0f93e54b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 9 Sep 2015 21:43:32 +0000 Subject: Revert "GITC: Always update the gitc manifest from the repo manifest" This reverts commit 250303b437855c2b50d052a05a08ed517423af8b. Change-Id: I1fd8af20f802553151aacb953c913f3305ca6057 --- subcmds/gitc_init.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'subcmds/gitc_init.py') diff --git a/subcmds/gitc_init.py b/subcmds/gitc_init.py index c957a9dc..e99affa5 100644 --- a/subcmds/gitc_init.py +++ b/subcmds/gitc_init.py @@ -68,13 +68,15 @@ use for this GITC client. os.mkdir(self.client_dir) super(GitcInit, self).Execute(opt, args) - manifest_file = self.manifest.manifestFile + for name, remote in self.manifest.remotes.iteritems(): + remote.fetchUrl = remote.resolvedFetchUrl + if opt.manifest_file: if not os.path.exists(opt.manifest_file): print('fatal: Specified manifest file %s does not exist.' % opt.manifest_file) sys.exit(1) - manifest_file = opt.manifest_file - gitc_utils.generate_gitc_manifest(self.repodir, opt.gitc_client, None, manifest_file) + self.manifest.Override(opt.manifest_file) + gitc_utils.generate_gitc_manifest(self.client_dir, self.manifest) print('Please run `cd %s` to view your GITC client.' % os.path.join(gitc_utils.GITC_FS_ROOT_DIR, opt.gitc_client)) -- cgit v1.2.3-54-g00ecf