diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-07-04 16:38:42 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-07-04 16:38:42 +0000 |
| commit | 45f7495cf1b62d402616caffacd9f343ca71c44d (patch) | |
| tree | adfc6de5c692d41e601dd74f0b2b6220f63004a1 | |
| parent | f8ac1720a94468d1384e88a57729e6d9801b56fd (diff) | |
* invert the auto-mark flag only for new installs (in MarkInstall()), keep it as it is for upgrades
| -rw-r--r-- | apt-pkg/depcache.cc | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 9adc4e390..4c52c6c71 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -708,7 +708,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.Mode = ModeInstall; P.InstallVer = P.CandidateVer; - P.Flags &= ~Flag::Auto; + // invert the auto-flag only for new installs, not for upgrades + if(P.Status == 0) + P.Flags &= ~Flag::Auto; if (P.CandidateVer == (Version *)Pkg.CurrentVer()) P.Mode = ModeKeep; diff --git a/configure.in b/configure.in index 2cbbd4b55..39dc6a988 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu1mvo1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu4mvo1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index a18f18f1a..a11b4ab31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.39ubuntu1mvo1) unstable; urgency=low +apt (0.6.39ubuntu4mvo1) unstable; urgency=low * Michael Vogt - Change debian/bugscript to use #!/bin/bash (Closes: #313402) |