From 60b5009cc4679d4b55fb0490d4d273b5cc6f220c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 19 Sep 2018 14:22:41 +0200 Subject: make testsuite work with rpm < 4.14.2 again --- NEWS | 2 ++ t/superuser--media_info_dir.t | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c22bedc5..00c5e14b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ - library: o fix _rpm_version() when rpm is translated +- testsuite: + o make it work with rpm < 4.14.2 again Version 8.114 - 17 September 2018 diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t index ddb190c5..e9f58f79 100644 --- a/t/superuser--media_info_dir.t +++ b/t/superuser--media_info_dir.t @@ -52,7 +52,8 @@ sub urpmi_force_skip_unknown { sub rpm_v3 { my @names = qw(libtermcap nls p2c); - system_("rpm --noverify --root $::pwd/root -i --ignorearch --noscripts media/rpm-v3/*.i386.rpm"); + my $noverify_opt = urpm::select::_rpm_version() ge 4.14.2 ? '--noverify' : ''; + system_("rpm $noverify_opt --root $::pwd/root -i --ignorearch --noscripts media/rpm-v3/*.i386.rpm"); check_installed_names(@names); foreach ('/lib/libtermcap.so.2.0.8', '/usr/lib/libp2c.so.1.2.0', '/usr/X11R6/lib/X11/nls/C') { -- cgit v1.2.1