diff options
| -rw-r--r-- | README.arch | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/README.arch b/README.arch index 92870d614..364e940a4 100644 --- a/README.arch +++ b/README.arch @@ -1,7 +1,7 @@ You can build apt from arch, but this needs the following additional packages (in addtion to the usual build-depends): -xmlto perlsgml sgml2x sgmlspl docbook +autoconf automake xmlto perlsgml sgml2x sgmlspl docbook then run: diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9389e7010..2cd2516bd 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()); @@ -2498,6 +2499,7 @@ bool DoBuildDep(CommandLine &CmdL) break; } if (CV.end() == true) + { if (hasAlternatives) { continue; @@ -2510,6 +2512,7 @@ bool DoBuildDep(CommandLine &CmdL) Last->BuildDepType((*D).Type),Src.c_str(), (*D).Package.c_str()); } + } } else { diff --git a/debian/changelog b/debian/changelog index c1b1f5676..a53b68501 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low - move unattended-upgrade before apt-get autoclean * fix "purge" commandline argument, closes LP: #125733 (thanks to Julien Danjou for the patch) - + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled (LP: #139448) + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200 apt (0.7.6ubuntu8) gutsy; urgency=low @@ -104,6 +107,9 @@ apt (0.7.6ubuntu1) gutsy; urgency=low - 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 [ Ian Jackson ] * dpkg-triggers: Deal properly with new package states. |