diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-06-08 18:52:46 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-06-08 18:52:46 +0000 |
commit | 5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2 (patch) | |
tree | 7a6f3748189a929489c3a3d93a725600a2243cd3 | |
parent | c9a5de787892b261ea6435cdaf7d26955f3a81a7 (diff) | |
download | urpmi-5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2.tar urpmi-5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2.tar.gz urpmi-5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2.tar.bz2 urpmi-5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2.tar.xz urpmi-5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2.zip |
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)"
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | t/superuser--failing-scriptlets.t | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -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'); |