summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-05-01 10:21:33 -0400
committerColin Walters <walters@verbum.org>2012-05-04 16:16:16 -0400
commitb845e0a2bb79fb8fee3f6e0d6375d648c44195b1 (patch)
tree61d23720a8236895a2f9360d92b495937d43a54b
parenta6a8e00edf5e2d695240a6f1663315ff65eaac5e (diff)
downloadostree-b845e0a2bb79fb8fee3f6e0d6375d648c44195b1.tar.gz
ostbuild: Resolve takes --manifest arg
-rwxr-xr-xsrc/ostbuild/pyostbuild/builtin_resolve.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ostbuild/pyostbuild/builtin_resolve.py b/src/ostbuild/pyostbuild/builtin_resolve.py
index 4ddd1ad0..fc7ca624 100755
--- a/src/ostbuild/pyostbuild/builtin_resolve.py
+++ b/src/ostbuild/pyostbuild/builtin_resolve.py
@@ -131,6 +131,7 @@ class OstbuildResolve(builtins.Builtin):
def execute(self, argv):
parser = argparse.ArgumentParser(description=self.short_description)
+ parser.add_argument('--manifest', required=True)
parser.add_argument('--fetch', action='store_true')
parser.add_argument('components', nargs='*')
@@ -140,8 +141,8 @@ class OstbuildResolve(builtins.Builtin):
self.parse_config()
self.repo = ostbuildrc.get_key('repo')
- manifest_path = self.ostbuildrc.get_key('manifest')
- self.manifest = json.load(open(manifest_path))
+ self.manifest = json.load(open(args.manifest))
+ self.prefix = self.manifest['prefix']
snapshot = copy.deepcopy(self.manifest)
component_source_list = map(self._resolve_component_meta, self.manifest['components'])