aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rpmtools.pm6
-rw-r--r--rpmtools.spec5
2 files changed, 8 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm
index a3655d2..ac9b9ea 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -146,8 +146,10 @@ sub build_hdlist {
foreach (@rpms) {
my ($key) = /([^\/]*)\.rpm$/ or next; #- get rpm filename.
- system("rpm2header '$_' > '$dir/$key'") unless -s "$dir/$key";
- $? == 0 or unlink("$dir/$key"), die "bad rpm $_\n";
+ unless (-s "$dir/$key") {
+ system("rpm2header '$_' > '$dir/$key'");
+ $? == 0 or unlink("$dir/$key"), die "bad rpm $_\n";
+ }
-s "$dir/$key" or unlink("$dir/$key"), die "bad rpm $_\n";
my ($name, $version, $release, $arch) = $key =~ /(.*)-([^-]*)-([^-]*)\.([^\.]*)$/;
diff --git a/rpmtools.spec b/rpmtools.spec
index 8cd9eea..ae0600d 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 8mdk
+%define release 9mdk
# do not modify here, see Makefile in the CVS
%define version 3.1
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Mon Nov 26 2001 François Pons <fpons@mandrakesoft.com> 3.1-9mdk
+- fixed bad rpm2header error analysis (especially under alpha).
+
* Mon Nov 26 2001 François Pons <fpons@mandrakesoft.com> 3.1-8mdk
- fixed compss file reading.