From 780223e8a12052f4d5e026cefb4eb37e15a93500 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 13 Oct 2017 13:07:00 +0100 Subject: Sort the glob matches so order consistent across filesystems --- ybd/rpm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ybd/rpm.py b/ybd/rpm.py index b63c5df..38c85b7 100644 --- a/ybd/rpm.py +++ b/ybd/rpm.py @@ -356,7 +356,8 @@ 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) -- cgit v1.2.1 From 13dec1257b947c864788764b1f53b716502d2302 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 13 Oct 2017 13:14:26 +0100 Subject: Exit should multiple file match the prebuilt rpm pattern Only applies if check-definitions is set to 'exit'. --- ybd/rpm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ybd/rpm.py b/ybd/rpm.py index 38c85b7..6b52963 100644 --- a/ybd/rpm.py +++ b/ybd/rpm.py @@ -362,8 +362,9 @@ def stage_prebuilts(dn, system): 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) os.rename(rpm_glob[0], cache_path) -- cgit v1.2.1 From 0072f777e53f3c60e4bf424b817bfbcae2847805 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 13 Oct 2017 13:15:20 +0100 Subject: Print which file is used should multiple files be matched --- ybd/rpm.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ybd/rpm.py b/ybd/rpm.py index 6b52963..d9fd990 100644 --- a/ybd/rpm.py +++ b/ybd/rpm.py @@ -365,6 +365,7 @@ def stage_prebuilts(dn, system): exit = config.get('check-definitions') == 'exit' log(dn, 'WARNING: glob pattern %s matches multiple paths' % package['path'], exit=exit) + log(dn, 'WARNING: Taking %s from glob match' % rpm_glob[0]) os.rename(rpm_glob[0], cache_path) -- cgit v1.2.1