mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-12-13 16:14:02 +08:00
GITC: Always update the gitc manifest from the repo manifest
This way any changes made to the main manifest are reflected in the gitc manifest. It's also necessary to use both manifests to sync since the information required to update the gitc manifest is actually in the repo manifest. This also fixes a few issues that came up when testing. notdefault groups weren't being saved to the gitc manifest in a method that matched 'sync'. The merge branch wasn't always being set to the correct value either. Change-Id: I5dbc850dd73a9fbd10ab2470ae4c40e46ff894de
This commit is contained in:
@@ -68,15 +68,13 @@ use for this GITC client.
|
||||
os.mkdir(self.client_dir)
|
||||
super(GitcInit, self).Execute(opt, args)
|
||||
|
||||
for name, remote in self.manifest.remotes.iteritems():
|
||||
remote.fetchUrl = remote.resolvedFetchUrl
|
||||
|
||||
manifest_file = self.manifest.manifestFile
|
||||
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)
|
||||
self.manifest.Override(opt.manifest_file)
|
||||
gitc_utils.generate_gitc_manifest(self.client_dir, self.manifest)
|
||||
manifest_file = opt.manifest_file
|
||||
gitc_utils.generate_gitc_manifest(self.repodir, opt.gitc_client, None, manifest_file)
|
||||
print('Please run `cd %s` to view your GITC client.' %
|
||||
os.path.join(gitc_utils.GITC_FS_ROOT_DIR, opt.gitc_client))
|
||||
|
||||
Reference in New Issue
Block a user