diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-20 10:59:13 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-12-20 10:59:13 +0100 |
| commit | 098d7904ec731c4b3d7e87c7bdb39c9e53a43c8d (patch) | |
| tree | 2042053cc5502632d442ace87117db9adae0dab2 | |
| parent | 9011a330ef082b298fc09f0bc8e936431b529ef3 (diff) | |
| parent | 4cc152f93acf2eaf3ae66424cd4aaf47cad14a7b (diff) | |
* merged from apt--mvo
| -rw-r--r-- | apt-pkg/algorithms.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/deb/debrecords.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -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..eb59a42ca 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -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 46ab467de..45f79f40a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,13 @@ apt (0.6.46.4ubuntu4) feisty; urgency=low * apt-pkg/algorithms.cc: - only increase the score of installed applications if they - are not obsolete (lp: #63680) + 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 <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/methods/http.cc b/methods/http.cc index 1833f41ef..0eef7a633 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" @@ -714,7 +715,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n"; + Req += "User-Agent: Ubuntu APT-HTTP/1.3 ("VERSION")\r\n\r\n"; if (Debug == true) cerr << Req << endl; |