Преглед изворни кода

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

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

Michael Vogt пре 19 година
родитељ
комит
04d0fa8803
3 измењених фајлова са 12 додато и 3 уклоњено
  1. 1 1
      README.arch
  2. 4 1
      cmdline/apt-get.cc
  3. 7 1
      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());
@@ -2498,6 +2499,7 @@ bool DoBuildDep(CommandLine &CmdL)
                            break;
                            break;
                  }
                  }
                  if (CV.end() == true)
                  if (CV.end() == true)
+		 {
 		   if (hasAlternatives)
 		   if (hasAlternatives)
 		   {
 		   {
 		      continue;
 		      continue;
@@ -2510,6 +2512,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
             {
             {

+ 7 - 1
debian/changelog

@@ -9,7 +9,10 @@ apt (0.7.6ubuntu9) gutsy; urgency=low
     - move unattended-upgrade before apt-get autoclean
     - move unattended-upgrade before apt-get autoclean
   * fix "purge" commandline argument, closes LP: #125733
   * fix "purge" commandline argument, closes LP: #125733
     (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 (LP: #139448)
+  
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Sep 2007 20:55:00 +0200
 
 
 apt (0.7.6ubuntu8) gutsy; urgency=low
 apt (0.7.6ubuntu8) gutsy; urgency=low
@@ -104,6 +107,9 @@ apt (0.7.6ubuntu1) gutsy; 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.