diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-07-26 23:29:20 +0200 |
| commit | af5a94f4c7b1f2cc797cd1e023e36a1bb359689d (patch) | |
| tree | b95e2e27ec3f5b020b055da187bb2012b1921aa3 /apt-pkg/tagfile.cc | |
| parent | 60681f9354217c830943315951e6559253bfa832 (diff) | |
| parent | 4577fda2b5f2b21f5400d10f4db71a8095f0df58 (diff) | |
* merged with mainline
Diffstat (limited to 'apt-pkg/tagfile.cc')
| -rw-r--r-- | apt-pkg/tagfile.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index dc1ba3f9e..25e2930fa 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -98,7 +98,8 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) iOffset = Offset; Start = Buffer + iOffset; - if (Tag.Scan(Start,End - Start) == false) + // Start != End is a special case to not fail on empty TagFiles + if (Start != End && Tag.Scan(Start,End - Start) == false) return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str()); return true; @@ -342,7 +343,8 @@ static const char *iTFRewritePackageOrder[] = { "Filename", "Size", "MD5Sum", - "SHA1Sum", + "SHA1", + "SHA256", "MSDOS-Filename", // Obsolete "Description", 0}; |