Explorar el Código

Make purge work again for config-files (LP: #244598) (Closes: #150831)

Julian Andres Klode hace 15 años
padre
commit
884cb8a574
Se han modificado 2 ficheros con 2 adiciones y 1 borrados
  1. 1 1
      apt-pkg/depcache.cc
  2. 1 0
      debian/changelog

+ 1 - 1
apt-pkg/depcache.cc

@@ -550,7 +550,7 @@ void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add)
    if (Pkg->CurrentVer == 0)
    if (Pkg->CurrentVer == 0)
    {
    {
       if (State.Mode == ModeDelete && 
       if (State.Mode == ModeDelete && 
-	  (State.iFlags | Purge) == Purge && Pkg.Purge() == false)
+	  (State.iFlags & Purge) == Purge && Pkg.Purge() == false)
 	 iDelCount += Add;
 	 iDelCount += Add;
       
       
       if (State.Mode == ModeInstall)
       if (State.Mode == ModeInstall)

+ 1 - 0
debian/changelog

@@ -2,6 +2,7 @@ apt (0.8.14.2) UNRELEASED; urgency=low
 
 
   * apt-pkg/depcache.cc:
   * apt-pkg/depcache.cc:
     - Really release action groups only once (Closes: #622744)
     - Really release action groups only once (Closes: #622744)
+    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
   * debian/apt.cron.daily:
   * debian/apt.cron.daily:
     - Check power after wait, patch by manuel-soto (LP: #705269)
     - Check power after wait, patch by manuel-soto (LP: #705269)
   * doc/apt-key.8.xml:
   * doc/apt-key.8.xml: