summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-01-07 15:20:56 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-01-17 01:52:30 +0100
commitc865af238e723fced2d9740c93d51f826762cee1 (patch)
treebe1689048c0ab6f069fefdf9bfd9fd32c957359f
parent2d7485c5c783f330f820dd62bd53c44c5cf42a5e (diff)
downloadurpmi-c865af238e723fced2d9740c93d51f826762cee1.tar
urpmi-c865af238e723fced2d9740c93d51f826762cee1.tar.gz
urpmi-c865af238e723fced2d9740c93d51f826762cee1.tar.bz2
urpmi-c865af238e723fced2d9740c93d51f826762cee1.tar.xz
urpmi-c865af238e723fced2d9740c93d51f826762cee1.zip
fix failing scriptlets test with rpm < 4.13.0
it got broken when wee added support for rpm 4.13.0 in commit cdcb6c6359e8ee2a590c3c40aa3b4d57ec3b1e80
-rw-r--r--NEWS1
-rw-r--r--t/superuser--failing-scriptlets.t7
2 files changed, 7 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cd6f0fd2..344e1f45 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- cpan_testers:
+ o fix failing scriptlets test with rpm < 4.13.0
o skip tests if we have no supported downloader
Version 8.120 - 21 October 2019
diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t
index 80c81146..6804eaaa 100644
--- a/t/superuser--failing-scriptlets.t
+++ b/t/superuser--failing-scriptlets.t
@@ -12,7 +12,12 @@ need_root_and_prepare();
test_install_rpm_fail('pre');
test_install_rpm_fail('pretrans');
test_install_rpm('post');
-test_install_rpm_but_uninstall_fail('preun');
+require urpm::select;
+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');
+}
test_install_rpm('postun');
test_install_rpm('posttrans');