From 5bf4eb39e7db2a9239040c13a501749ee2ee208a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 16 Jan 2012 09:57:40 -0500 Subject: [PATCH] ostbuild: Do fetches before resolution Otherwise we get the OLD revision in the manifest. --- src/ostbuild/pyostbuild/builtin_resolve.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ostbuild/pyostbuild/builtin_resolve.py b/src/ostbuild/pyostbuild/builtin_resolve.py index d680094a..516d144e 100755 --- a/src/ostbuild/pyostbuild/builtin_resolve.py +++ b/src/ostbuild/pyostbuild/builtin_resolve.py @@ -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')