aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-01 03:48:37 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-01 03:48:37 +0000
commit1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e (patch)
tree8a6d96a3f07b8870af9711d74881cd9930446ef1
parent7f7eed305aac36826048cd9427c72913d500b5be (diff)
downloadperl-URPM-1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e.tar
perl-URPM-1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e.tar.gz
perl-URPM-1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e.tar.bz2
perl-URPM-1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e.tar.xz
perl-URPM-1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e.zip
Ensure archs are identical
-rw-r--r--URPM/Build.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/URPM/Build.pm b/URPM/Build.pm
index 63e9961..073eaa8 100644
--- a/URPM/Build.pm
+++ b/URPM/Build.pm
@@ -533,13 +533,15 @@ sub make_delta_rpm ($$) {
my @id;
my $urpm = new URPM;
foreach my $i (0, 1) {
- defined (($id[$i]) = $urpm->parse_rpm($files[$i])) or return 0;
+ ($id[$i]) = $urpm->parse_rpm($files[$i]);
+ defined $id[$i] or return 0;
}
my $oldpkg = $urpm->{depslist}[$id[0]];
my $newpkg = $urpm->{depslist}[$id[1]];
+ $oldpkg->arch eq $newpkg->arch or return 0;
#- construct filename of the deltarpm
my $patchrpm = $oldpkg->name . '-' . $oldpkg->version . '-' . $oldpkg->release . '_' . $newpkg->version . '-' . $newpkg->release . '.' . $oldpkg->arch . '.delta.rpm';
- !system($MAKEDELTARPM, $old, $new, $patchrpm);
+ !system($MAKEDELTARPM, $files[0], $files[1], $patchrpm);
}
1;