Просмотр исходного кода

* invert the auto-mark flag only for new installs (in MarkInstall()), keep it as it is for upgrades

Michael Vogt лет назад: 21
Родитель
Сommit
45f7495cf1
3 измененных файлов с 5 добавлено и 3 удалено
  1. 3 1
      apt-pkg/depcache.cc
  2. 1 1
      configure.in
  3. 1 1
      debian/changelog

+ 3 - 1
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;
        

+ 1 - 1
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)

+ 1 - 1
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)