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

ostbuild: Do fetches before resolution 

Otherwise we get the OLD revision in the manifest.
This commit is contained in:
Colin Walters 2012-01-16 09:57:40 -05:00
parent a6e6146ab6
commit 5bf4eb39e7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,14 +102,6 @@ class OstbuildResolve(builtins.Builtin):
self.manifest = json.load(open(manifest_path))
self.resolved_components = map(self._resolve_component_meta, self.manifest['components'])
for component in self.resolved_components:
(keytype, uri) = self._parse_src_key(component['src'])
mirrordir = self._ensure_vcs_mirror(component['name'],
keytype, uri,
component['branch'])
revision = buildutil.get_git_version_describe(mirrordir,
component['branch'])
component['revision'] = revision
if args.fetch:
if len(args.components) == 0:
@ -124,12 +116,22 @@ class OstbuildResolve(builtins.Builtin):
break
if not found:
fatal("Unknown component %r" % (component_name, ))
(keytype, uri) = self._parse_src_key(component['src'])
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)
for component in self.resolved_components:
(keytype, uri) = self._parse_src_key(component['src'])
mirrordir = self._ensure_vcs_mirror(component['name'],
keytype, uri,
component['branch'])
revision = buildutil.get_git_version_describe(mirrordir,
component['branch'])
component['revision'] = revision
self.manifest['components'] = self.resolved_components
out_manifest = os.path.join(self.workdir, 'manifest.json')