diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-01-14 07:59:52 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-01-14 07:59:52 +0100 |
| commit | 64680d3bf12db6599e93f950546e380e0bd5ddf4 (patch) | |
| tree | b2a09005541d931d7d787b05558d71c3371b31d2 | |
| parent | cb6a2b3eaca4353d7f490fb360b98c08d64a2d8c (diff) | |
fix skipping of already downloaded files and add some FIXMEs
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.cc | 13 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 45cc0ae82..c620c2298 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -116,16 +116,21 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List) { List.erase(List.begin(),List.end()); + // FIXME: build string dynamically from + // Hashes::SupportedHashes const char *hash_field[] = { "Checksums-Sha512", "Checksums-Sha256", "Checksums-Sha1", "Files", // historic name NULL, }; - const char *hash_type[] = { "Sha512", - "Sha256", - "Sha1", - "md5sum", + + // FIXME: use string from Hashes::SupportedHashes + // FIXME2: this is case senstivie + const char *hash_type[] = { "SHA512", + "SHA256", + "SHA1", + "MD5Sum", NULL, }; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 68e7f829c..a2a19cd11 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2560,7 +2560,7 @@ bool DoSource(CommandLine &CmdL) if(!I->Hash.empty() && FileExists(flNotDir(I->Path))) { HashString hash_string = HashString(I->Hash); - if(hash_string.VerifyFile(I->Path)) + if(hash_string.VerifyFile(flNotDir(I->Path))) { ioprintf(c1out,_("Skipping already downloaded file '%s'\n"), flNotDir(I->Path).c_str()); |