ソースを参照

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

Michael Vogt 19 年 前
親
コミット
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
 You can build apt from arch, but this needs the following additional
 packages (in addtion to the usual build-depends):
 packages (in addtion to the usual build-depends):
-xmlto perlsgml sgml2x sgmlspl docbook
+autoconf automake xmlto perlsgml sgml2x sgmlspl docbook
 
 
 then run:
 then run:
 
 

+ 4 - 1
cmdline/apt-get.cc

@@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
 	    // where foo is marked automatic
 	    // where foo is marked automatic
 	    if(!Remove && 
 	    if(!Remove && 
 	       Cache[Pkg].Install() == false && 
 	       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"),
 	       ioprintf(c1out,_("%s set to manual installed.\n"),
 			Pkg.Name());
 			Pkg.Name());
@@ -2471,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL)
                            break;
                            break;
                  }
                  }
                  if (CV.end() == true)
                  if (CV.end() == true)
+		 {
 		   if (hasAlternatives)
 		   if (hasAlternatives)
 		   {
 		   {
 		      continue;
 		      continue;
@@ -2483,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL)
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            (*D).Package.c_str());
                                            (*D).Package.c_str());
 		   }
 		   }
+		 }
             }
             }
             else
             else
             {
             {

+ 3 - 0
debian/changelog

@@ -30,6 +30,9 @@ apt (0.7.7) UNRELEASED; urgency=low
     - move unattended-upgrade before apt-get autoclean
     - move unattended-upgrade before apt-get autoclean
   * fix "purge" commandline argument, closes: #133421
   * fix "purge" commandline argument, closes: #133421
     (thanks to Julien Danjou for the patch)
     (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 ]
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.
   * dpkg-triggers: Deal properly with new package states.