summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-04-10 18:39:06 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-04-28 20:58:59 +0200
commita994197786a6510b2abed1865d1a44d368418109 (patch)
tree87409a84a114c61df902c4aaef4ecc749a70b082
parentaee22dfd270ecdd3afb8f42cdda6d346c3705679 (diff)
downloadurpmi-a994197786a6510b2abed1865d1a44d368418109.tar
urpmi-a994197786a6510b2abed1865d1a44d368418109.tar.gz
urpmi-a994197786a6510b2abed1865d1a44d368418109.tar.bz2
urpmi-a994197786a6510b2abed1865d1a44d368418109.tar.xz
urpmi-a994197786a6510b2abed1865d1a44d368418109.zip
fix test with rpm < 4.13 on CentOS7
-rw-r--r--NEWS1
-rw-r--r--t/superuser--failing-scriptlets.t2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 78d218b1..8e8d7ece 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o check & report where genhdlist2 is
o check that web server has actually started
o describe more tests to help pinpoint regressions
+ o fix test with rpm < 4.13 on CentOS7
o perform some file conflict tests only on Mageia
Version 8.121 - 8 April 2020
diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t
index 6804eaaa..73adcada 100644
--- a/t/superuser--failing-scriptlets.t
+++ b/t/superuser--failing-scriptlets.t
@@ -13,7 +13,7 @@ test_install_rpm_fail('pre');
test_install_rpm_fail('pretrans');
test_install_rpm('post');
require urpm::select;
-if (urpm::select::_rpm_version() lt 4.13.0) { # && -e '/etc/mageia-release') {
+if (urpm::select::_rpm_version() lt 4.13.0 && -e '/etc/mageia-release') {
test_install_rpm('preun');
} else {
test_install_rpm_but_uninstall_fail('preun');