shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

ostbuild: Fix pull-components

Browse Source 
We need to pull the actual commits, not the refs.
This commit is contained in:
Colin Walters 2012-05-10 10:30:02 -04:00
parent 488ce33795
commit d1b23f0807
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ostbuild/pyostbuild/builtin_pull_components.py
View File

@ -40,31 +40,19 @@ class OstbuildPullComponents(builtins.Builtin):
def execute(self, argv):
parser = argparse.ArgumentParser(description=self.short_description)
parser.add_argument('origin')
parser.add_argument('targets', nargs='*')
parser.add_argument('--prefix')
parser.add_argument('--bin-snapshot')
args = parser.parse_args(argv)
self.parse_config()
self._init_repo()
self.parse_bin_snapshot(args.prefix, args.bin_snapshot)
if len(args.targets) == 0:
targets = [self.active_branch]
else:
targets = args.targets
tree_contents_list = []
for target in targets:
tree_contents_path = os.path.join(self.ostree_dir, target, 'contents.json')
tree_contents = json.load(open(tree_contents_path))
tree_contents_list.append(tree_contents)
revisions = set()
for tree_contents in tree_contents_list:
for component in tree_contents['components']:
revisions.add('components/' + component)
args = ['ostree-pull', '--repo=' + self.repo]
# FIXME FIXME - don't hardcode origin here
args.append('gnome')
for revision in revisions:
args.append(revision)
run_sync(args)
child_args = ['ostree-pull', '--repo=' + self.repo, '--prefer-loose',
args.origin]
for component,revision in self.bin_snapshot['components'].iteritems():
child_args.append(revision)
run_sync(child_args)
builtins.register(OstbuildPullComponents)