From 250cfa0d7318a364a8d48efaa268ce25b14cf3c3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 5 Oct 2017 14:26:47 +0200 Subject: fix a rpm-4.14 regression Reloading the spec file object else next build fails with rpm-4.14 --- RPM4/NEWS | 1 + RPM4/t/04spec.t | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RPM4/NEWS b/RPM4/NEWS index 3dd8682..ca5653f 100644 --- a/RPM4/NEWS +++ b/RPM4/NEWS @@ -1,6 +1,7 @@ - fix running rpm_produced - improve doc - fix a segfault +- fix rpm-4.14 regressions - testsuite: o disable tests that involve a pasphrase diff --git a/RPM4/t/04spec.t b/RPM4/t/04spec.t index 38bbed0..e9b1499 100644 --- a/RPM4/t/04spec.t +++ b/RPM4/t/04spec.t @@ -2,7 +2,7 @@ # $Id$ use strict; -use Test::More tests => 26; +use Test::More tests => 27; use FindBin qw($Bin); use File::Temp qw(tempdir); use RPM4; @@ -47,6 +47,8 @@ ok($h->queryformat("%{NAME}") eq "test-rpm", "can querying header give by spec") ok($spec->build([ qw(PREP) ]) == 0, "simulate rpm -bp (check prep)"); ok($spec->build([ qw(BUILD) ]) == 0, "simulate rpm -bc"); ok($spec->build([ qw(INSTALL CHECK) ]) == 0, "simulate rpm -bi"); +# else next test fails with rpm-4.14: +ok($spec = RPM4::Spec->new("$Bin/test-rpm.spec"), "ReLoading the spec file"); ok($spec->build([ qw(FILECHECK) ]) == 0, "simulate rpm -bl"); #ok($spec->build([ qw(PACKAGEBINARY CLEAN) ]) == 0, "simulate rpm -bb (binary, clean)"); ok($spec->build([ qw(PACKAGESOURCE) ]) == 0, "simulate rpm -bs"); -- cgit v1.2.1