summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-03-06 17:58:16 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-03-06 17:58:16 +0100
commitde31189fca11b7de937a64de90bcc050b76f9181 (patch)
treece9c6f63729900dcf0d221c2aaafbfef91f34ed4
parente8184cc38f673a3d86be9268525cf259120c2a9e (diff)
add Debug::pkgAcqArchive::NoQueue to disable package downloading
-rw-r--r--apt-pkg/acquire-item.cc13
-rw-r--r--debian/changelog3
2 files changed, 14 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 545a57d37..a30e98858 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1810,7 +1810,18 @@ bool pkgAcqArchive::QueueNext()
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);
diff --git a/debian/changelog b/debian/changelog
index df89181a0..86ff1bf2d 100644
--- 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)
+ - 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
@@ -87,7 +88,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
- 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