From: Julian Andres Klode <jak@debian.org>
Date: Sat, 26 Jun 2010 18:56:44 +0000 (+0200)
Subject: * apt-pkg/deb/deblistparser.cc:
X-Git-Tag: 0.8.0~9^2~34
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d4af23c2d81116b8f7557ee795059bca126ae9f4

* apt-pkg/deb/deblistparser.cc:
  - Handle architecture wildcards (Closes: #547724).
---

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 83c5b8d2e..ddbd0d31a 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -19,6 +19,7 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
 
+#include <fnmatch.h>
 #include <ctype.h>
 									/*}}}*/
 
@@ -572,8 +573,15 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 	       I++;
             }
 
-	    if (stringcmp(arch,I,End) == 0)
+	    if (stringcmp(arch,I,End) == 0) {
 	       Found = true;
+	    } else {
+	       std::string wildcard = SubstVar(string(I, End), "any", "*");
+	       if (fnmatch(wildcard.c_str(), arch.c_str(), 0) == 0)
+	          Found = true;
+	       else if (fnmatch(wildcard.c_str(), ("linux-" + arch).c_str(), 0) == 0)
+	          Found = true;
+	    }
 	    
 	    if (*End++ == ']') {
 	       I = End;
diff --git a/debian/changelog b/debian/changelog
index 037dfa7bd..8de7d18e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.7.26~exp8) experimental; urgency=low
 
   * methods/ftp.h:
     - Handle different logins are on the same server (Closes: #586904).
+  * apt-pkg/deb/deblistparser.cc:
+    - Handle architecture wildcards (Closes: #547724).
 
  -- Julian Andres Klode <jak@debian.org>  Thu, 24 Jun 2010 10:56:39 +0200