diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-09-14 16:11:56 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-09-14 16:11:56 +0200 |
| commit | 085bedacb04be4f805b0fb9d3b2a611d5d475d62 (patch) | |
| tree | d145ba502eca20cf33e5a0ede8340953bf7c5c7f | |
| parent | 1d6386f35066c1cc3c053f94fccf379d86075eac (diff) | |
* cmdline/apt-get.cc:
- do not change the auto-installed information if a package
is reinstalled
| -rw-r--r-- | README.arch | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 8 insertions, 2 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 a52a34979..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 { diff --git a/debian/changelog b/debian/changelog index 5bf454aa9..e07863c2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,9 @@ apt (0.7.7) UNRELEASED; 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. |