summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorAdam Conrad <adconrad@0c3.net>2013-01-18 01:09:43 -0700
committerAdam Conrad <adconrad@0c3.net>2013-01-18 01:09:43 -0700
commit68225779d1337336707c33c0265fc537ae256813 (patch)
tree6c4174f63b3014622f5b6132890846f5d47f1c29 /cmdline/apt-get.cc
parent0dbd03a21542c03b0d9769787c8f794a697f3097 (diff)
* Merge from Debian unstable, pulling in new translations and fixes.
* Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard. * Catalan (Jordi Mallach) * Drop a confusing non-breaking space. Closes: #691024 * Thai (Theppitak Karoonboonyanan). Closes: #691613 * Vietnamese (Trần Ngọc Quân). Closes: #693773 * Fix Plural forms in German, French, Japanese and Portuguese translations. Thanks to Jakub Wilk for reporting these errors. * apt-pkg/packagemanager.cc: - do not do lock-step configuration for a M-A:same package if it isn't unpacked yet in SmartConfigure and do not unpack a M-A:same package again in SmartUnPack if we have already configured it (LP: #1062503) * apt-pkg/depcache.cc: - don't call MarkInstall with the FromUser flag set for packages which are dependencies of APT::Never-MarkAuto-Sections matchers - no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk * cmdline/apt-get.cc: - do not call Mark{Install,Delete} from the autoremove code with the FromUser bit set to avoid modifying the auto-installed bit * apt-pkg/algorithms.cc: - ensure pkgProblemResolver calls MarkDelete without FromUser set so that it can't overrule holds and the protection flag * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) * apt-pkg/algorithms.cc: - fix package-pointer array memory leak in ResolveByKeepInternal() * Portuguese (Américo Monteiro) (Closes: #686975) * handle packages without a mandatory architecture (debian-policy §5.3) by introducing a pseudo-architecture 'none' so that the small group of users with these packages can get right of them without introducing too much hassle for other users (Closes: #686346) * merged the latest debian-sid fixes Correct fi translation for hash sum mismatches (lp:420403)
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 54408329a..4f48c7294 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1736,7 +1736,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
{
if(Pkg.CurrentVer() != 0 &&
Pkg->CurrentState != pkgCache::State::ConfigFiles)
- Cache->MarkDelete(Pkg, purgePkgs);
+ Cache->MarkDelete(Pkg, purgePkgs, 0, false);
else
Cache->MarkKeep(Pkg, false, false);
}
@@ -1750,7 +1750,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
{
if (Pkg.CandVersion() != 0)
tooMuch.insert(Pkg);
- Cache->MarkDelete(Pkg, false);
+ Cache->MarkDelete(Pkg, false, 0, false);
}
// only show stuff in the list that is not yet marked for removal
else if(hideAutoRemove == false && Cache[Pkg].Delete() == false)
@@ -1787,7 +1787,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
continue;
if (Debug == true)
std::clog << "Save " << Pkg << " as another installed garbage package depends on it" << std::endl;
- Cache->MarkInstall(Pkg, false);
+ Cache->MarkInstall(Pkg, false, 0, false);
if (hideAutoRemove == false)
++autoRemoveCount;
tooMuch.erase(Pkg);