diff options
| author | Michael Vogt <egon@bottom> | 2007-01-12 20:47:02 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2007-01-12 20:47:02 +0100 |
| commit | bedb5293c16d105966d9bf48951483af0fbaff2a (patch) | |
| tree | d87a1f589f47b5a99e7a0f8f893ab07558de4cc2 | |
| parent | e3d924ac623ec88310bfd36f1e425440f5885aab (diff) | |
| parent | 020daa7b026cf1496959ccc9d062d95cb5f8ec02 (diff) | |
* merged from apt--mvo
| -rw-r--r-- | apt-pkg/algorithms.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/deb/debrecords.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | methods/http.cc | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 5e878ff65..bd8147291 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -512,7 +512,7 @@ void pkgProblemResolver::MakeScores() on the same level. We enhance the score of installed packages if those are not obsolete */ - if (I->CurrentVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) + if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) Score += 1; } @@ -861,7 +861,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) OldEnd = LEnd; } else + { Start++; + // We only worry about critical deps. + if (Start.IsCritical() != true) + continue; + } // Dep is ok if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall) diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 518988bb6..5eb2d67bb 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -67,7 +67,7 @@ string debRecordParser::MD5Hash() /* */ string debRecordParser::SHA1Hash() { - return Section.FindS("SHA1Sum"); + return Section.FindS("SHA1"); } /*}}}*/ // RecordParser::Maintainer - Return the maintainer email /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 9f8326739..c40804746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,12 @@ apt (0.6.46.5) UNRELEASED; urgency=low - use clog for all debugging - only increase the score of installed applications if they are not obsolete + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value -- Michael Vogt <mvo@debian.org> Thu, 14 Dec 2006 11:31:41 +0100 diff --git a/methods/http.cc b/methods/http.cc index 1f3b038bc..5aefd4c1f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -44,6 +44,7 @@ // Internet stuff #include <netdb.h> +#include "config.h" #include "connect.h" #include "rfc2553emu.h" #include "http.h" @@ -713,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n"; + Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; if (Debug == true) cerr << Req << endl; |