diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-19 14:22:41 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2018-09-19 15:37:25 +0200 |
| commit | 60b5009cc4679d4b55fb0490d4d273b5cc6f220c (patch) | |
| tree | a8b3e52b8142d603c135d1e459077b37b7af5f55 | |
| parent | d544abfb415854477c99e511a354a8ccf60644b6 (diff) | |
| download | urpmi-60b5009cc4679d4b55fb0490d4d273b5cc6f220c.tar urpmi-60b5009cc4679d4b55fb0490d4d273b5cc6f220c.tar.gz urpmi-60b5009cc4679d4b55fb0490d4d273b5cc6f220c.tar.bz2 urpmi-60b5009cc4679d4b55fb0490d4d273b5cc6f220c.tar.xz urpmi-60b5009cc4679d4b55fb0490d4d273b5cc6f220c.zip | |
make testsuite work with rpm < 4.14.2 again
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | t/superuser--media_info_dir.t | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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') { |