From 1e0eb1139e125f6009949fd61d5088d5cc9084db Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 4 Aug 2015 04:07:50 -0400 Subject: convert trigger scriptlets from lua to sh needed for next commit because: lua's exit(1) is ignored since rpm-4.9.0 --- NEWS | 2 ++ t/data/SPECS/failing-scriptlets/post.spec | 6 +++--- t/data/SPECS/failing-scriptlets/posttrans.spec | 6 +++--- t/data/SPECS/failing-scriptlets/postun.spec | 6 +++--- t/data/SPECS/failing-scriptlets/pre.spec | 6 +++--- t/data/SPECS/failing-scriptlets/pretrans.spec | 6 +++--- t/data/SPECS/failing-scriptlets/preun.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerin-1.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerin-2.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerpostun-1.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerpostun-2.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerprein-1.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerprein-2.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerun-1.spec | 6 +++--- t/data/SPECS/failing-scriptlets/triggerun-2.spec | 6 +++--- 15 files changed, 44 insertions(+), 42 deletions(-) diff --git a/NEWS b/NEWS index 8970833b..7c6adb44 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ - testsuite: o misc enhancements & cleanups + o fix tests for ignored faillure for %pre{,un}, %pretrans + (was ignored since rpm-4.9.0) Version 8.05 - 18 March 2015 diff --git a/t/data/SPECS/failing-scriptlets/post.spec b/t/data/SPECS/failing-scriptlets/post.spec index 82983524..16b11f29 100644 --- a/t/data/SPECS/failing-scriptlets/post.spec +++ b/t/data/SPECS/failing-scriptlets/post.spec @@ -7,8 +7,8 @@ License: x %description x -%post -p -print("%{name}-%{version}") -exit(1) +%post +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/posttrans.spec b/t/data/SPECS/failing-scriptlets/posttrans.spec index b0fab580..4fac74d9 100644 --- a/t/data/SPECS/failing-scriptlets/posttrans.spec +++ b/t/data/SPECS/failing-scriptlets/posttrans.spec @@ -7,8 +7,8 @@ License: x %description x -%posttrans -p -print("%{name}-%{version}") -exit(1) +%posttrans +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/postun.spec b/t/data/SPECS/failing-scriptlets/postun.spec index f81f5712..0694c950 100644 --- a/t/data/SPECS/failing-scriptlets/postun.spec +++ b/t/data/SPECS/failing-scriptlets/postun.spec @@ -7,8 +7,8 @@ License: x %description x -%postun -p -print("%{name}-%{version}") -exit(1) +%postun +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/pre.spec b/t/data/SPECS/failing-scriptlets/pre.spec index 2e1c65fa..9b0c576d 100644 --- a/t/data/SPECS/failing-scriptlets/pre.spec +++ b/t/data/SPECS/failing-scriptlets/pre.spec @@ -7,8 +7,8 @@ License: x %description x -%pre -p -print("%{name}-%{version}") -exit(1) +%pre +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/pretrans.spec b/t/data/SPECS/failing-scriptlets/pretrans.spec index fc05448e..0056689f 100644 --- a/t/data/SPECS/failing-scriptlets/pretrans.spec +++ b/t/data/SPECS/failing-scriptlets/pretrans.spec @@ -7,8 +7,8 @@ License: x %description x -%pretrans -p -print("%{name}-%{version}") -exit(1) +%pretrans +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/preun.spec b/t/data/SPECS/failing-scriptlets/preun.spec index b1533eaa..e3840d81 100644 --- a/t/data/SPECS/failing-scriptlets/preun.spec +++ b/t/data/SPECS/failing-scriptlets/preun.spec @@ -7,8 +7,8 @@ License: x %description x -%preun -p -print("%{name}-%{version}") -exit(1) +%preun +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerin-1.spec b/t/data/SPECS/failing-scriptlets/triggerin-1.spec index f1e8ab28..35efde97 100644 --- a/t/data/SPECS/failing-scriptlets/triggerin-1.spec +++ b/t/data/SPECS/failing-scriptlets/triggerin-1.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerin -p -- triggerin > 0 -print("%{name}-%{version}") -exit(1) +%triggerin -- triggerin > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerin-2.spec b/t/data/SPECS/failing-scriptlets/triggerin-2.spec index a417386a..d9c418f5 100644 --- a/t/data/SPECS/failing-scriptlets/triggerin-2.spec +++ b/t/data/SPECS/failing-scriptlets/triggerin-2.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerin -p -- triggerin > 0 -print("%{name}-%{version}") -exit(1) +%triggerin -- triggerin > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerpostun-1.spec b/t/data/SPECS/failing-scriptlets/triggerpostun-1.spec index 6b8ab48d..90614986 100644 --- a/t/data/SPECS/failing-scriptlets/triggerpostun-1.spec +++ b/t/data/SPECS/failing-scriptlets/triggerpostun-1.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerpostun -p -- triggerpostun > 0 -print("%{name}-%{version}") -exit(1) +%triggerpostun -- triggerpostun > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerpostun-2.spec b/t/data/SPECS/failing-scriptlets/triggerpostun-2.spec index 2d7bc917..1055c558 100644 --- a/t/data/SPECS/failing-scriptlets/triggerpostun-2.spec +++ b/t/data/SPECS/failing-scriptlets/triggerpostun-2.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerpostun -p -- triggerpostun > 0 -print("%{name}-%{version}") -exit(1) +%triggerpostun -- triggerpostun > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerprein-1.spec b/t/data/SPECS/failing-scriptlets/triggerprein-1.spec index 464dcb17..62036dd6 100644 --- a/t/data/SPECS/failing-scriptlets/triggerprein-1.spec +++ b/t/data/SPECS/failing-scriptlets/triggerprein-1.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerprein -p -- triggerprein > 0 -print("%{name}-%{version}") -exit(1) +%triggerprein -- triggerprein > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerprein-2.spec b/t/data/SPECS/failing-scriptlets/triggerprein-2.spec index daee9d68..d910b015 100644 --- a/t/data/SPECS/failing-scriptlets/triggerprein-2.spec +++ b/t/data/SPECS/failing-scriptlets/triggerprein-2.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerprein -p -- triggerprein > 0 -print("%{name}-%{version}") -exit(1) +%triggerprein -- triggerprein > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerun-1.spec b/t/data/SPECS/failing-scriptlets/triggerun-1.spec index cb74aa58..7fc0ad7f 100644 --- a/t/data/SPECS/failing-scriptlets/triggerun-1.spec +++ b/t/data/SPECS/failing-scriptlets/triggerun-1.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerun -p -- triggerun > 0 -print("%{name}-%{version}") -exit(1) +%triggerun -- triggerun > 0 +print "%{name}-%{version}" +exit 1 %files diff --git a/t/data/SPECS/failing-scriptlets/triggerun-2.spec b/t/data/SPECS/failing-scriptlets/triggerun-2.spec index 0a6adff2..b30330b1 100644 --- a/t/data/SPECS/failing-scriptlets/triggerun-2.spec +++ b/t/data/SPECS/failing-scriptlets/triggerun-2.spec @@ -7,8 +7,8 @@ License: x %description x -%triggerun -p -- triggerun > 0 -print("%{name}-%{version}") -exit(1) +%triggerun -- triggerun > 0 +print "%{name}-%{version}" +exit 1 %files -- cgit v1.2.1