From a3371852091e3590bd425f2674b56ae3d5ae2445 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 19:46:44 +0000 Subject: * turn off "secure-acquire" when --allow-unauthenticated is given --- apt-pkg/acquire-item.cc | 6 ++++++ debian/changelog | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index dea68f3ee..debd1face 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -770,6 +770,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, } } + // "allow-unauthenticated" restores apts old fetching behaviour + // that means that e.g. unauthenticated file:// uris are higher + // priority than authenticated http:// uris + if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) + Trusted = false; + // Select a source if (QueueNext() == false && _error->PendingError() == false) _error->Error(_("I wasn't able to locate file for the %s package. " diff --git a/debian/changelog b/debian/changelog index 0b0343d9c..9e9b46ab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,10 +11,12 @@ apt (0.6.42.3) unstable; urgency=low - patch-128: Danish translation update (closes: #337949) - patch-129: Basque translation update (closes: #338101) * cmdline/apt-get.cc: - - bufix in FindSrc (closes: #335213) + - bufix in FindSrc (closes: #335213, #337910) * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) - -- Michael Vogt Wed, 9 Nov 2005 05:52:31 +0100 + -- Michael Vogt Wed, 9 Nov 2005 07:22:31 +0100 apt (0.6.42.2) unstable; urgency=high -- cgit v1.2.3