Explorar el Código

* merged with apt--mvo

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
   * turn off "secure-acquire" when --allow-unauthenticated is given
Michael Vogt hace 20 años
padre
commit
bc7c97627e
Se han modificado 2 ficheros con 10 adiciones y 2 borrados
  1. 6 0
      apt-pkg/acquire-item.cc
  2. 4 2
      debian/changelog

+ 6 - 0
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. "

+ 4 - 2
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 <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