diff options
| author | Ben Brown <ben.brown@codethink.co.uk> | 2017-07-20 17:00:07 +0100 |
|---|---|---|
| committer | Ben Brown <ben.brown@codethink.co.uk> | 2017-07-21 10:09:23 +0100 |
| commit | 4c67111e10257fb1ca9036491ca66dd5f631a7a2 (patch) | |
| tree | b99dca5b9af1886293554244ce91ac2cf8cd9dbd | |
| parent | 61fbcd3d4ae831722efb0d80c9b16e1055c80589 (diff) | |
| download | ybd-4c67111e10257fb1ca9036491ca66dd5f631a7a2.tar.gz | |
Expand metafile macros when copying into metadir
| -rw-r--r-- | ybd/rpm.py | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -250,7 +250,8 @@ def extract_defines(dn): return ''.join(strings) -def extract_metafiles(metadata, instdir, metadir): +def extract_metafiles(system, dn, instdir, metadir): + metadata = dn['rpm-metadata'] if isinstance(metadata, Mapping): packages = metadata.get('packages', []) else: @@ -258,6 +259,7 @@ def extract_metafiles(metadata, instdir, metadir): for package in packages: metafile = package.get('metafile', '').lstrip(os.sep) + metafile = expand_macro(system, dn, metafile) if metafile: shutil.move(os.path.join(instdir, metafile), metadir) @@ -457,7 +459,7 @@ def package_one_rpm(dn, userdata): if generate_spec(dn, fulldir, metafile, specfile, name, system): defines = extract_defines(dn) - extract_metafiles(dn['rpm-metadata'], fulldir, metadir) + extract_metafiles(system, dn, fulldir, metadir) # XXX Now we gonna run rpmbuild in the sandbox !!! command = ('rpmbuild ' + common_rpm_args + |