Prechádzať zdrojové kódy

* apt-pkg/deb/dpkgpm.cc:
- skip --configure if all packages disappeared

David Kalnischkies 15 rokov pred
rodič
commit
6f31b247ba
2 zmenil súbory, kde vykonal 14 pridanie a 2 odobranie
  1. 6 2
      apt-pkg/deb/dpkgpm.cc
  2. 8 0
      debian/changelog

+ 6 - 2
apt-pkg/deb/dpkgpm.cc

@@ -1002,6 +1002,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       else
       else
       {
       {
 	 string const nativeArch = _config->Find("APT::Architecture");
 	 string const nativeArch = _config->Find("APT::Architecture");
+	 unsigned long const oldSize = I->Op == Item::Configure ? Size : 0;
 	 for (;I != J && Size < MaxArgBytes; I++)
 	 for (;I != J && Size < MaxArgBytes; I++)
 	 {
 	 {
 	    if((*I).Pkg.end() == true)
 	    if((*I).Pkg.end() == true)
@@ -1016,8 +1017,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	       Args[n++] = Packages[pkgcount++];
 	       Args[n++] = Packages[pkgcount++];
 	    }
 	    }
 	    Size += strlen(Args[n-1]);
 	    Size += strlen(Args[n-1]);
-	 }	 
-      }      
+	 }
+	 // skip configure action if all sheduled packages disappeared
+	 if (oldSize == Size)
+	    continue;
+      }
       Args[n] = 0;
       Args[n] = 0;
       J = I;
       J = I;
       
       

+ 8 - 0
debian/changelog

@@ -1,3 +1,11 @@
+apt (0.8.13.1) UNRELEASED; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - skip --configure if all packages disappeared
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 16 Mar 2011 18:37:53 +0100
+
 apt (0.8.13) unstable; urgency=low
 apt (0.8.13) unstable; urgency=low
 
 
   [ Thorsten Spindler ]
   [ Thorsten Spindler ]