From 2ca6f0426520a928b1d59c96153141d9bfd34681 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 5 May 2012 22:40:03 -0400 Subject: [PATCH] ostbuild: make pull-components work This builtin did not work for me. It did not initialize self.repo, it used the nonexisting parse_active_branch function unconditionally, and it did not actually find the list of components in contents.json. This commit fixes all three of these issues. --- src/ostbuild/pyostbuild/builtin_pull_components.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ostbuild/pyostbuild/builtin_pull_components.py b/src/ostbuild/pyostbuild/builtin_pull_components.py index 7464b1ed..5d0e5254 100755 --- a/src/ostbuild/pyostbuild/builtin_pull_components.py +++ b/src/ostbuild/pyostbuild/builtin_pull_components.py @@ -43,10 +43,10 @@ class OstbuildPullComponents(builtins.Builtin): parser.add_argument('targets', nargs='*') args = parser.parse_args(argv) - - self.parse_active_branch() + self._init_repo() if len(args.targets) == 0: + self.parse_active_branch() targets = [self.active_branch] else: targets = args.targets @@ -58,8 +58,8 @@ class OstbuildPullComponents(builtins.Builtin): tree_contents_list.append(tree_contents) revisions = set() for tree_contents in tree_contents_list: - for content_item in tree_contents['contents']: - revisions.add(content_item['ostree-revision']) + for component in tree_contents['components']: + revisions.add('components/' + component) args = ['ostree-pull', '--repo=' + self.repo] # FIXME FIXME - don't hardcode origin here args.append('gnome')