* apt-pkg/deb/deblistparser.cc:

  - add support for arch-specific qualifiers in dependencies

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 0a7e415380228a0e8c520b04ad279b322fa2e154..4948c9be4939b8a6389427e5f815ad112e8e82d5 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -637,16 +637,18 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
    if (Section.Find(Tag,Start,Stop) == false)
       return true;
 
-   string Package;
    string const pkgArch = Ver.Arch();
-   string Version;
-   unsigned int Op;
 
    while (1)
    {
+      string Package;
+      string Version;
+      unsigned int Op;
+
       Start = ParseDepends(Start,Stop,Package,Version,Op,false,!MultiArchEnabled);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
+      size_t const found = Package.rfind(':');
 
       if (MultiArchEnabled == true &&
          (Type == pkgCache::Dep::Conflicts ||
@@ -658,6 +660,18 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
            if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
               return false;
       }
+      else if (MultiArchEnabled == true && found != string::npos &&
+              strcmp(Package.c_str() + found, ":any") != 0)
+      {
+        string Arch = Package.substr(found+1, string::npos);
+        Package = Package.substr(0, found);
+        // Such dependencies are not supposed to be accepted …
+        // … but this is probably the best thing to do.
+        if (Arch == "native")
+           Arch = _config->Find("APT::Architecture");
+        if (NewDepends(Ver,Package,Arch,Version,Op,Type) == false)
+           return false;
+      }
       else if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
         return false;
       if (Start == Stop)

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index e06e74579523d715a970ce4d1ddebe62b856bc1d..f694a237e2435c446fef9cd0c413f6868c3b1829 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -715,7 +715,10 @@ bool pkgCache::DepIterator::IsIgnorable(PrvIterator const &Prv) const
    sometimes it is needed to identify these to ignore them… */
 bool pkgCache::DepIterator::IsMultiArchImplicit() const
 {
-   if (ParentPkg()->Arch != TargetPkg()->Arch)
+   if (ParentPkg()->Arch != TargetPkg()->Arch &&
+       (S->Type == pkgCache::Dep::Replaces ||
+       S->Type == pkgCache::Dep::DpkgBreaks ||
+       S->Type == pkgCache::Dep::Conflicts))
       return true;
    return false;
 }

diff --git a/debian/changelog b/debian/changelog
index 1b33daa4e9ed85a4d52914e5e42d4de55c35231d..a89f78de91ca541de0afa843218af50a53cb2f0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,8 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   [ Thibaut Girka ]
   * cmdline/apt-get.cc:
     - complain correctly about :any build-dep on M-A:none packages
+  * apt-pkg/deb/deblistparser.cc:
+    - add support for arch-specific qualifiers in dependencies
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 06 Jun 2012 23:54:01 +0200