* turn off "secure-acquire" when --allow-unauthenticated is given

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index dea68f3eef8259034f58e2ae222595529f1bdf0b..debd1face5c7c2c0a8ccc9556cc9e56e59de2c90 100644 (file)
--- 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. "
    // 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 0b0343d9c9fcc3ce57e1c309dd4a7a89b0d18817..9e9b46ab9c36a9ebd16290465bea3f857f0695b8 100644 (file)
--- 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:
     - 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)
   * added armeb to archtable (closes: #333599)

+  * with --allow-unauthenticated use the old fallback behaviour for
+    sources (closes: #335112)

    
    

- -- Michael Vogt <mvo@debian.org>  Wed,  9 Nov 2005 05:52:31 +0100
+ -- Michael Vogt <mvo@debian.org>  Wed,  9 Nov 2005 07:22:31 +0100

 
 apt (0.6.42.2) unstable; urgency=high
 
 
 apt (0.6.42.2) unstable; urgency=high