summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-04-20 10:47:05 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-04-20 10:47:05 +0200
commit9d81a7ece7b28fadd73516937e3ec7ac3f52be44 (patch)
treea15062859220140dc688d05801fbc412e85f3aa3
parenta4e4b1f4b2765bff0272ecfbe8caa072775b12be (diff)
merged r2204 from lp:~donkult/apt/sid
-rw-r--r--apt-pkg/cacheset.cc7
-rw-r--r--debian/changelog5
-rwxr-xr-xtest/integration/test-bug-593360-modifiers-in-names5
3 files changed, 15 insertions, 2 deletions
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index b892ab4bf..e2dbe0e57 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -217,6 +217,7 @@ bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, P
pkgCacheFile &Cache, const char * cmdline,
std::list<Modifier> const &mods, CacheSetHelper &helper) {
std::string str = cmdline;
+ unsigned short fallback = modID;
bool modifierPresent = false;
for (std::list<Modifier>::const_iterator mod = mods.begin();
mod != mods.end(); ++mod) {
@@ -243,6 +244,7 @@ bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, P
helper.showErrors(errors);
if (Pkg.end() == false) {
pci->insert(Pkg);
+ modID = fallback;
return true;
}
}
@@ -281,13 +283,14 @@ bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID,
modifierPresent = true;
break;
}
-
if (modifierPresent == true) {
bool const errors = helper.showErrors(false);
bool const found = VersionContainerInterface::FromString(vci, Cache, cmdline, select, helper, true);
helper.showErrors(errors);
- if (found == true)
+ if (found == true) {
+ modID = fallback;
return true;
+ }
}
return FromString(vci, Cache, str, select, helper);
}
diff --git a/debian/changelog b/debian/changelog
index d637beb59..ee59beb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ apt (0.8.16~exp12ubuntu10) UNRELEASEDprecise-proposed; urgency=low
ordering code does not get into a endless loop when it flip-flops
between two states
+ [ David Kalnischkies ]
+ * apt-pkg/cacheset.cc:
+ - actually return to the fallback modifier if we have detected we
+ should for packagenames which look like modifiers (Closes: #669591)
+
-- Malcolm Scott <launchpad@malc.org.uk> Thu, 19 Apr 2012 19:52:56 +0100
apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
diff --git a/test/integration/test-bug-593360-modifiers-in-names b/test/integration/test-bug-593360-modifiers-in-names
index 83a3cfabf..74826cbdb 100755
--- a/test/integration/test-bug-593360-modifiers-in-names
+++ b/test/integration/test-bug-593360-modifiers-in-names
@@ -15,6 +15,11 @@ The following NEW packages will be installed:
Inst g++ (4:4.4.5-1 localhost [i386])
Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g++ -s
+testequal "Reading package lists...
+Building dependency tree...
+Package 'g++' is not installed, so not removed
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove g++ -s
+
testequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed: