add Debug::pkgAcqArchive::NoQueue to disable package downloading

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 545a57d3733ea0e6aa0ae7f8961ad0de7cdd530e..a30e98858adf645763408442fc185ade9a1413e7 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1810,7 +1810,18 @@ bool pkgAcqArchive::QueueNext()
         else
            PartialSize = Buf.st_size;
       }
         else
            PartialSize = Buf.st_size;
       }

-      
+
+      // Disables download of archives - useful if no real installation follows,
+      // e.g. if we are just interested in proposed installation order
+      if (_config->FindB("Debug::pkgAcqArchive::NoQueue", false) == true)
+      {
+        Complete = true;
+        Local = true;
+        Status = StatDone;
+        StoreFilename = DestFile = FinalFile;
+        return true;
+      }
+

       // Create the item
       Local = false;
       Desc.URI = Index->ArchiveURI(PkgFile);
       // Create the item
       Local = false;
       Desc.URI = Index->ArchiveURI(PkgFile);

diff --git a/debian/changelog b/debian/changelog
index df89181a011a28fcc3bdd15bd4930d15f01c7b0a..86ff1bf2da009a64f7020cf123cb8d9bf40e7c28 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
       proceeding with Release.gpg to avoid the false impression of a still
       trusted repository by a (still present) old InRelease file.
       Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
       proceeding with Release.gpg to avoid the false impression of a still
       trusted repository by a (still present) old InRelease file.
       Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)

+    - add Debug::pkgAcqArchive::NoQueue to disable package downloading

   * apt-pkg/deb/dpkgpm.cc:
     - chroot if needed before dpkg --assert-multi-arch
     - ensure that dpkg binary doesn't have the chroot-directory prefixed
   * apt-pkg/deb/dpkgpm.cc:
     - chroot if needed before dpkg --assert-multi-arch
     - ensure that dpkg binary doesn't have the chroot-directory prefixed


@@ -87,7 +88,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
     - Not automatically installed during dist-upgrade
     - No higher score for installation ordering
 
     - Not automatically installed during dist-upgrade
     - No higher score for installation ordering
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 06 Mar 2012 10:52:00 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 06 Mar 2012 17:57:22 +0100

 
 apt (0.8.16~exp12) experimental; urgency=low
 
 
 apt (0.8.16~exp12) experimental; urgency=low