From 5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Jun 2012 18:52:46 +0000 Subject: fix a testsuite regression with rpm-4.10.0 disable failing %%pretrans test with rpm-4.10.0 which now fails with: "error: pretrans-1-1.x86_64: install skipped" b/c in rpm-4.10.0: "%pretrans scriptlet failure now fails the install of the package %(similarly to %pre and %preun semantics)" --- NEWS | 1 + t/superuser--failing-scriptlets.t | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index e8845cc4..3cdce6ca 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ - adapt to perl-5.16.0 +- adapt to rpm-4.10.0 - enhance man pages caption (inspirated by mdv) - fix testsuite regressions - o make 'basename' option work again for rpmdrake diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t index 740e4369..9d8a5929 100644 --- a/t/superuser--failing-scriptlets.t +++ b/t/superuser--failing-scriptlets.t @@ -4,13 +4,17 @@ use strict; use lib '.', 't'; use helper; use Test::More 'no_plan'; +require urpm::select; my $medium_name = 'failing-scriptlets'; need_root_and_prepare(); test_install_rpm_fail('pre'); -test_install_rpm('pretrans'); +#%pretrans scriptlet failure now fails the install of the package (similarly to %pre and %preun semantics): +if (urpm::select::_rpm_version() lt 4.10.0) { + test_install_rpm('pretrans'); +} test_install_rpm('post'); test_install_rpm('preun'); test_install_rpm('postun'); -- cgit v1.2.1