* apt-pkg/cacheset.cc:

  - handle :all and :native correctly as architectures again
    in the commandline parsing (regression in 0.9.7)

diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 784d1f0bf1338dade40f4b835d7c93b33d118b8e..1fea4f94a21710b0773ba944228a6492569bbe1d 100644 (file)
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -193,6 +193,8 @@ bool PackageContainerInterface::FromGroup(PackageContainerInterface * const pci,
        if (archfound != std::string::npos) {
                arch = pkg.substr(archfound+1);
                pkg.erase(archfound);
+               if (arch == "all" || arch == "native")
+                       arch = _config->Find("APT::Architecture");
        }
 
        pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg);

diff --git a/debian/changelog b/debian/changelog
index a9ef6a967d47463db5a57d5ffbf3854628d6cbd2..33a466b56d545dae60d4026ca53482b2d4ac0e0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,12 @@ apt (0.9.7.3) UNRELEASED; urgency=low
   [ Program translation updates ]
   * Czech (Miroslav Kure). Closes: #680758
 
- -- Christian Perrier <bubulle@debian.org>  Sat, 14 Jul 2012 09:47:02 -0600
+  [ David Kalnischkies ]
+  * apt-pkg/cacheset.cc:
+    - handle :all and :native correctly as architectures again
+      in the commandline parsing (regression in 0.9.7)
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jul 2012 11:45:57 +0200
 
 apt (0.9.7.2) unstable; urgency=low
 

diff --git a/test/integration/test-cachecontainer-architecture-specification b/test/integration/test-cachecontainer-architecture-specification
index 55e464a07017c5c5c48dc52ada20ca380203987d..47abfb5b0ec1b55b44cadcee04052f184c453d8c 100755 (executable)
--- a/test/integration/test-cachecontainer-architecture-specification
+++ b/test/integration/test-cachecontainer-architecture-specification
@@ -8,6 +8,7 @@ configarchitecture 'amd64' 'armel'
 
 #insertinstalledpackage 'xserver-xorg-core' 'amd64' '2:1.7.6-2ubuntu7.10'
 insertpackage 'unstable' 'libsame' 'armel,amd64' '1' 'Multi-Arch: same'
+insertpackage 'unstable' 'foo' 'all' '1'
 
 setupaptarchive
 
@@ -88,3 +89,35 @@ Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-*
 testequal 'Reading package lists...
 Building dependency tree...
 E: Unable to locate package libsame' aptget -s install libsame:windows-any
+
+testequal 'Reading package lists...
+Building dependency tree...
+E: Unable to locate package foo' aptget -s install foo:armel
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:all
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:amd64
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  foo
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1 unstable [all])
+Conf foo (1 unstable [all])' aptget -s install foo:native