packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Make --fetch a separate option

This commit is contained in:
Colin Walters 2012-01-14 16:56:31 -05:00
parent aeeed8da13
commit 610afbd2f1
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,6 @@ class OstbuildResolve(builtins.Builtin):
if not os.path.isdir(mirror): if not os.path.isdir(mirror):
run_sync(['git', 'clone', '--mirror', uri, tmp_mirror]) run_sync(['git', 'clone', '--mirror', uri, tmp_mirror])
os.rename(tmp_mirror, mirror) os.rename(tmp_mirror, mirror)
elif self.args.fetch:
log("Running git fetch for %s" % (name, ))
run_sync(['git', 'fetch'], cwd=mirror, log_initiation=False)
return mirror return mirror
def _parse_src_key(self, srckey): def _parse_src_key(self, srckey):
@ -94,6 +91,7 @@ class OstbuildResolve(builtins.Builtin):
def execute(self, argv): def execute(self, argv):
parser = argparse.ArgumentParser(description=self.short_description) parser = argparse.ArgumentParser(description=self.short_description)
parser.add_argument('--fetch', action='store_true') parser.add_argument('--fetch', action='store_true')
parser.add_argument('components', nargs='*')
args = parser.parse_args(argv) args = parser.parse_args(argv)
self.args = args self.args = args
@ -104,7 +102,6 @@ class OstbuildResolve(builtins.Builtin):
self.manifest = json.load(open(manifest_path)) self.manifest = json.load(open(manifest_path))
self.resolved_components = map(self._resolve_component_meta, self.manifest['components']) self.resolved_components = map(self._resolve_component_meta, self.manifest['components'])
for component in self.resolved_components: for component in self.resolved_components:
(keytype, uri) = self._parse_src_key(component['src']) (keytype, uri) = self._parse_src_key(component['src'])
mirrordir = self._ensure_vcs_mirror(component['name'], mirrordir = self._ensure_vcs_mirror(component['name'],
@ -114,6 +111,25 @@ class OstbuildResolve(builtins.Builtin):
component['branch']) component['branch'])
component['revision'] = revision component['revision'] = revision
if args.fetch:
if len(args.components) == 0:
fetch_components = map(lambda x: x['name'], self.resolved_components)
else:
fetch_components = args.components
for component_name in fetch_components:
found = False
for component in self.resolved_components:
if component['name'] == component_name:
found = True
break
if not found:
fatal("Unknown component %r" % (component_name, ))
mirrordir = self._ensure_vcs_mirror(component['name'],
keytype, uri,
component['branch'])
log("Running git fetch for %s" % (component['name'], ))
run_sync(['git', 'fetch'], cwd=mirrordir, log_initiation=False)
self.manifest['components'] = self.resolved_components self.manifest['components'] = self.resolved_components
out_manifest = os.path.join(self.workdir, 'manifest.json') out_manifest = os.path.join(self.workdir, 'manifest.json')