diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-07-12 20:39:59 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-07-12 20:39:59 +0200 |
| commit | 5f20ac7f11ae5718595d6e570474d120d30e36db (patch) | |
| tree | 39bf1e06f387c75c8979b24281226a8b8a1d629e /apt-pkg | |
| parent | cef094c2ec8214b2783a2ac3aa70cf835381eae1 (diff) | |
* apt-pkg/cachefilter.cc:
- remove architecture-specific arch to tuple expansion-rules as they lead
to the same tuples for different architectures (e.g. linux-arm for arm,
armel and armhf) while the dpkg-architecture code uses triples which
are different (in the first part, which we omit in our tuples), so e.g.
build-dep restrictions for armel ended up effecting armhf as well
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cachefilter.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 35f95fe22..58cc812bf 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -66,12 +66,6 @@ static std::string CompleteArch(std::string const &arch) { complete = complete.substr(1, complete.size()-2); return complete; } - else if (arch == "armel") return "linux-arm"; - else if (arch == "armhf") return "linux-arm"; - else if (arch == "lpia") return "linux-i386"; - else if (arch == "powerpcspe") return "linux-powerpc"; - else if (arch == "uclibc-linux-armel") return "linux-arm"; - else if (arch == "uclinux-armel") return "uclinux-arm"; else if (arch == "any") return "*-*"; else return "linux-" + arch; } |