summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2007-10-02 13:52:22 +0200
committerMichael Vogt <egon@bottom>2007-10-02 13:52:22 +0200
commit3346b385523c596c1db7667b4874a8617718de70 (patch)
tree9bef8479ffdc2e80ae83ffdf02255aac0b0beb9d /cmdline/apt-get.cc
parent36fc5dca8b8eaa38a4ebd3ec52b462df44dd1b82 (diff)
parent59d5cc74ef7c6ca820ed9d26a4d829b891214edf (diff)
- fix parse error when dpkg sends unexpected data
* fix missing SetExecClose() call when the status-fd is used * debian/apt.cron.daily: - move unattended-upgrade before apt-get autoclean * fix "purge" commandline argument, closes: #133421 (thanks to Julien Danjou for the patch) * cmdline/apt-get.cc: - do not change the auto-installed information if a package is reinstalled * apt-pkg/acquire-item.cc: - fix crash in diff acquire code * cmdline/apt-mark: - Fix chmoding after have renamed the extended-states file (LP: #140019) (thanks to Laurent Bigonville) * apt-pkg/contrib/mmap.cc: - don't fail if msync() returns > 0
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c9ec481aa..e214691f8 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
// where foo is marked automatic
if(!Remove &&
Cache[Pkg].Install() == false &&
- (Cache[Pkg].Flags & pkgCache::Flag::Auto))
+ (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
+ _config->FindB("APT::Get::ReInstall",false) == false)
{
ioprintf(c1out,_("%s set to manual installed.\n"),
Pkg.Name());
@@ -2471,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL)
break;
}
if (CV.end() == true)
+ {
if (hasAlternatives)
{
continue;
@@ -2483,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL)
Last->BuildDepType((*D).Type),Src.c_str(),
(*D).Package.c_str());
}
+ }
}
else
{
@@ -2752,6 +2755,7 @@ int main(int argc,const char *argv[])
{"install",&DoInstall},
{"remove",&DoInstall},
{"autoremove",&DoInstall},
+ {"purge",&DoInstall},
{"dist-upgrade",&DoDistUpgrade},
{"dselect-upgrade",&DoDSelectUpgrade},
{"build-dep",&DoBuildDep},