Allow comparing unsupported architectures for equality and identity

diff --git a/ChangeLog b/ChangeLog
index 19b3742e607614795a79a7b13a595748f52ebe07..028e2b6716c72e28ece2805065b7696266d09ef2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-08  Frank Lichtenheld  <djpig@debian.org>,
+            Guillem Jover  <guillem@debian.org>
+
+       * scripts/controllib.pl (debarch_is): Check if $alias is equal to
+       $real or 'any' before mapping them to debtriplets.
+       (debarch_to_debtriplet): Do not special case 'any' nor 'all'.
+       (debarch_eq): Check if $a and $b are equal before mapping them to
+       debtriplets.
+
 2007-10-07  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-buildpackage.pl: Warn if run as root and $rootcommand

diff --git a/debian/changelog b/debian/changelog
index 139d1c026d711e1401c594cdcaee257ccee0955e..6bf9eb7c59252ecf32d0ef734cb68a7ac1d1b9c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
     instead of unconditionally setting it to 'Installed'. Closes: #432893
     Thanks to Brian M. Carlson.
   * Add Vcs-Browser and Vcs-Git fields to debian/control.
+  * Allow comparing unsupported architectures for equality and identity.
+    Based on a patch by Frank Lichtenheld. Closes: #427210
 
   [ Frank Lichtenheld ]
   * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto.

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 1b7c52d9f2eeef44a5d0617cf99f38abea3533d3..e7ef8abde68d38aa4a5e048db17c8cff0cd01c31 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -249,10 +249,7 @@ sub debarch_to_debtriplet($)
     local ($_) = @_;
     my $arch;
 
-    # FIXME: 'any' is handled here, to be able to do debarch_eq('any', foo).
-    if (/^any$/ || /^all$/) {
-       return ($_, $_, $_);
-    } elsif (/^linux-([^-]*)/) {
+    if (/^linux-([^-]*)/) {
        # XXX: Might disappear in the future, not sure yet.
        $arch = $1;
     } else {
@@ -288,6 +285,9 @@ sub debwildcard_to_debtriplet($)
 sub debarch_eq($$)
 {
     my ($a, $b) = @_;
+
+    return 1 if ($a eq $b);
+
     my @a = debarch_to_debtriplet($a);
     my @b = debarch_to_debtriplet($b);
 
@@ -299,6 +299,9 @@ sub debarch_eq($$)
 sub debarch_is($$)
 {
     my ($real, $alias) = @_;
+
+    return 1 if ($alias eq $real or $alias eq 'any');
+
     my @real = debarch_to_debtriplet($real);
     my @alias = debwildcard_to_debtriplet($alias);