Browse Source

* apt-pkg/cacheset.cc:

- handle :all and :native correctly as architectures again
    in the commandline parsing (regression in 0.9.7)
tags/debian/0.9.7.3^2
David Kalnischkies 9 years ago
parent
commit
f1d86c0ee9
3 changed files with 41 additions and 1 deletions
  1. +2
    -0
      apt-pkg/cacheset.cc
  2. +6
    -1
      debian/changelog
  3. +33
    -0
      test/integration/test-cachecontainer-architecture-specification

+ 2
- 0
apt-pkg/cacheset.cc View File

@@ -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);


+ 6
- 1
debian/changelog View File

@@ -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



+ 33
- 0
test/integration/test-cachecontainer-architecture-specification View File

@@ -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

Loading…
Cancel
Save