summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/deblistparser.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-11-15 10:28:27 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-11-15 10:28:27 +0100
commit58a642755c63cde3cf377d3719d66add27b13d65 (patch)
tree92719b94ccca55b5e128f28e9499e1ec331a5440 /apt-pkg/deb/deblistparser.cc
parentfd8bb61d2945d2e2f19f0e0a753129235717a9f3 (diff)
parent3cf1e4b50a9bb439c4f54a631cfebbb6c4d1ea7d (diff)
merged from debian
Diffstat (limited to 'apt-pkg/deb/deblistparser.cc')
-rw-r--r--apt-pkg/deb/deblistparser.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index da8b0271b..1b3bfd6ae 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
*/
static string CompleteArch(std::string& arch) {
if (arch == "armel") return "linux-arm";
+ if (arch == "armhf") return "linux-arm";
if (arch == "lpia") return "linux-i386";
if (arch == "powerpcspe") return "linux-powerpc";
if (arch == "uclibc-linux-armel") return "linux-arm";