From 1d01d5ba0b3d05b45d9d0dd4bbc37e73e665372e Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 1 Jun 2005 03:48:37 +0000
Subject: Ensure archs are identical

---
 URPM/Build.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'URPM')

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;
-- 
cgit v1.2.1