diff options
| -rw-r--r-- | ybd/rpm.py | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -356,13 +356,16 @@ def stage_prebuilts(dn, system): basedir = os.path.join(system['sandbox'], '%s.inst' % dn['name']) cache_path = os.path.join( system['sandbox'], 'RPMS', '%s.rpm' % package['name']) - rpm_glob = glob(os.path.join(basedir, package['path'].lstrip('/'))) + rpm_glob = sorted(glob( + os.path.join(basedir, package['path'].lstrip('/')))) if not rpm_glob: log(dn, 'Failed to find prebuilt rpm matching', package['path']) sys.exit(1) if len(rpm_glob) > 1: + exit = config.get('check-definitions') == 'exit' log(dn, 'WARNING: glob pattern %s matches multiple paths' % - package['path']) + package['path'], exit=exit) + log(dn, 'WARNING: Taking %s from glob match' % rpm_glob[0]) os.rename(rpm_glob[0], cache_path) |