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

ostbuild: Make resolve fully expand config-opts, delete now-unnecessary vcsconfig 

The source manifest format allows for compression, but it's more
convenient for consuming code if it's fully expanded in one place.
This commit is contained in:
Colin Walters 2012-02-22 15:17:42 -05:00
parent b26b981b0d
commit 0a195e6874
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,17 @@ class OstbuildResolve(builtins.Builtin):
component['branch'])
component['revision'] = revision
if 'component' not in component:
component['component'] = 'runtime'
config_opts = list(self.manifest['config-opts'])
config_opts.extend(component.get('config-opts', []))
component['config-opts'] = config_opts
# We expand these two keys
del self.manifest['config-opts']
del self.manifest['vcsconfig']
mirror_gitconfig_path = os.path.join(self.mirrordir, 'gitconfig')
git_mirrordir = os.path.join(self.mirrordir, 'git')
f = open(mirror_gitconfig_path, 'w')