diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-10 04:19:29 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-11-10 04:19:29 +0000 |
commit | dce5db2944b46964b41776dec4e2239a06678dfc (patch) | |
tree | 10fb6d64b05e8e3218cb8423fe5349436bcc8ced /apt-pkg/acquire-item.cc | |
parent | 1d1b09d580e2de36f719cd9e1f6004b265b41cb9 (diff) | |
parent | a3371852091e3590bd425f2674b56ae3d5ae2445 (diff) |
* merged with debians apt
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88
* finalized changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89
* turn off "secure-acquire" when --allow-unauthenticated is given
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ef107444f..343293386 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -769,6 +769,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. " |