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 /apt-pkg | |
| parent | 9011a330ef082b298fc09f0bc8e936431b529ef3 (diff) | |
| parent | 4cc152f93acf2eaf3ae66424cd4aaf47cad14a7b (diff) | |
* merged from apt--mvo
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/algorithms.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/deb/debrecords.cc | 2 |
2 files changed, 6 insertions, 1 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 /*{{{*/ |