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

* cmdline/apt-get.cc:
- do not change the auto-installed information if a package
is reinstalled

Michael Vogt лет назад: 19
Родитель
Сommit
085bedacb0
3 измененных файлов с 8 добавлено и 2 удалено
  1. 1 1
      README.arch
  2. 4 1
      cmdline/apt-get.cc
  3. 3 0
      debian/changelog

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

+ 4 - 1
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
             {

+ 3 - 0
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.