summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/policy.cc49
-rw-r--r--debian/changelog3
2 files changed, 29 insertions, 23 deletions
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index b47dab90c..4ae3b5f87 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -27,6 +27,7 @@
#include <apt-pkg/policy.h>
#include <apt-pkg/configuration.h>
+#include <apt-pkg/cachefilter.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
@@ -259,17 +260,33 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
}
// find the package (group) this pin applies to
- pkgCache::GrpIterator Grp;
- pkgCache::PkgIterator Pkg;
- if (Arch.empty() == false)
- Pkg = Cache->FindPkg(Name, Arch);
- else {
- Grp = Cache->FindGrp(Name);
- if (Grp.end() == false)
- Pkg = Grp.PackageList();
+ pkgCache::GrpIterator Grp = Cache->FindGrp(Name);
+ bool matched = false;
+ if (Grp.end() == false)
+ {
+ std::string MatchingArch;
+ if (Arch.empty() == true)
+ MatchingArch = Cache->NativeArch();
+ else
+ MatchingArch = Arch;
+ APT::CacheFilter::PackageArchitectureMatchesSpecification pams(MatchingArch);
+ for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
+ {
+ if (pams(Pkg.Arch()) == false)
+ continue;
+ Pin *P = Pins + Pkg->ID;
+ // the first specific stanza for a package is the ruler,
+ // all others need to be ignored
+ if (P->Type != pkgVersionMatch::None)
+ P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
+ P->Type = Type;
+ P->Priority = Priority;
+ P->Data = Data;
+ matched = true;
+ }
}
- if (Pkg.end() == true)
+ if (matched == false)
{
PkgPin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
if (Arch.empty() == false)
@@ -279,20 +296,6 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
P->Data = Data;
return;
}
-
- for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
- {
- Pin *P = Pins + Pkg->ID;
- // the first specific stanza for a package is the ruler,
- // all others need to be ignored
- if (P->Type != pkgVersionMatch::None)
- P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
- P->Type = Type;
- P->Priority = Priority;
- P->Data = Data;
- if (Grp.end() == true)
- break;
- }
}
/*}}}*/
// Policy::GetMatch - Get the matching version for a package pin /*{{{*/
diff --git a/debian/changelog b/debian/changelog
index 545791f34..09d818e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ apt (0.9.7.6) UNRELEASED; urgency=low
* apt-pkg/edsp.cc:
- include reinstall requests and already installed (= protected) packages
in the install-request for external resolvers (Closes: #689331)
+ * apt-pkg/policy.cc:
+ - match pins with(out) an architecture as we do on the commandline
+ (partly fixing #687255, b= support has to wait for jessie)
-- David Kalnischkies <kalnischkies@gmail.com> Wed, 19 Sep 2012 11:29:56 +0200