shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-23 21:35:26 +03:00
Code Issues Projects Releases Wiki Activity

ostbuild: Have resolve use git-mirror rather than duplicating code

Browse Source 
This also brings us back to a sensible world of:

ostbuild resolve --fetch

Doing both fetch *and* writing out the updated revisions.
This commit is contained in:
Colin Walters 2012-05-26 12:10:51 -04:00
parent 9582effb8d
commit d3b063cec0
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ostbuild/pyostbuild/builtin_resolve.py
View File

@ -77,7 +77,7 @@ class OstbuildResolve(builtins.Builtin):
parser = argparse.ArgumentParser(description=self.short_description) parser = argparse.ArgumentParser(description=self.short_description)
parser.add_argument('--manifest', required=True) parser.add_argument('--manifest', required=True)
parser.add_argument('--fetch-patches', action='store_true') parser.add_argument('--fetch-patches', action='store_true')
parser.add_argument('components', nargs='*') parser.add_argument('--fetch', action='store_true')
args = parser.parse_args(argv) args = parser.parse_args(argv)
self.args = args self.args = args
@ -90,25 +90,35 @@ class OstbuildResolve(builtins.Builtin):
components = map(self._resolve_component_meta, self.snapshot['components']) components = map(self._resolve_component_meta, self.snapshot['components'])
self.snapshot['components'] = components self.snapshot['components'] = components
global_patches_meta = self._resolve_component_meta(self.snapshot['patches'])
self.snapshot['patches'] = global_patches_meta
(keytype, uri) = vcs.parse_src_key(global_patches_meta['src'])
mirrordir = vcs.ensure_vcs_mirror(self.mirrordir, keytype, uri, global_patches_meta['branch'])
if args.fetch_patches:
run_sync(['git', 'fetch'], cwd=mirrordir, log_initiation=False)
revision = buildutil.get_git_version_describe(mirrordir, global_patches_meta['branch'])
global_patches_meta['revision'] = revision
unique_component_names = set() unique_component_names = set()
for component in components: for component in components:
(keytype, uri) = vcs.parse_src_key(component['src'])
name = component['name'] name = component['name']
if name in unique_component_names: if name in unique_component_names:
fatal("Duplicate component name '%s'" % (name, )) fatal("Duplicate component name '%s'" % (name, ))
unique_component_names.add(name) unique_component_names.add(name)
branch_or_tag = component.get('branch') or component.get('tag') global_patches_meta = self._resolve_component_meta(self.snapshot['patches'])
self.snapshot['patches'] = global_patches_meta
(keytype, uri) = vcs.parse_src_key(global_patches_meta['src'])
mirrordir = vcs.ensure_vcs_mirror(self.mirrordir, keytype, uri, global_patches_meta['branch'])
if args.fetch_patches:
run_sync(['git', 'fetch'], cwd=mirrordir, log_initiation=False)
git_mirror_args = ['ostbuild', 'git-mirror']
if args.fetch:
git_mirror_args.append('--fetch')
run_sync(git_mirror_args)
patch_revision = buildutil.get_git_version_describe(mirrordir, global_patches_meta['branch'])
global_patches_meta['revision'] = patch_revision
for component in components:
src = component['src']
(keytype, uri) = vcs.parse_src_key(src)
branch = component.get('branch')
tag = component.get('tag')
branch_or_tag = branch or tag
mirrordir = vcs.ensure_vcs_mirror(self.mirrordir, keytype, uri, branch_or_tag) mirrordir = vcs.ensure_vcs_mirror(self.mirrordir, keytype, uri, branch_or_tag)
revision = buildutil.get_git_version_describe(mirrordir, branch_or_tag) revision = buildutil.get_git_version_describe(mirrordir, branch_or_tag)
component['revision'] = revision component['revision'] = revision