From: Michael Vogt Date: Fri, 9 Jun 2006 15:41:52 +0000 (+0200) Subject: * merged with bubulle X-Git-Tag: 0.7.21~317^2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b90d7d855709c49a6d5faff0ac65b96fd15e4500?ds=inline * merged with bubulle --- b90d7d855709c49a6d5faff0ac65b96fd15e4500 diff --cc apt-pkg/tagfile.cc index 9763d96a3,dc1ba3f9e..79ff18de4 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@@ -98,7 -98,7 +98,8 @@@ bool pkgTagFile::Jump(pkgTagSection &Ta 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; diff --cc debian/changelog index 5e1620b7e,6ce11aafb..0c31db6bd --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,3 +1,26 @@@ +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) ++ * merged from ++ http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: ++ * sk.po: Completed to 512t ++ * eu.po: Completed to 512t ++ * fr.po: Completed to 512t ++ * sv.po: Completed to 512t ++ * Update all PO and the POT. Gives 506t6f for formerly ++ complete translations + + -- + +apt (0.6.44.1-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't give an error when parsing empty Packages/Sources files. + (Closes: #366931, #367086, #370160) + + -- Steinar H. Gunderson Fri, 9 Jun 2006 00:52:21 +0200 + apt (0.6.44.1) unstable; urgency=low * merged from @@@ -22,7 -7,7 +30,7 @@@ - po/hu.po: Hungarian translation update. Closes: #365448 - po/cs.po: Czech translation updated. Closes: #367244 -- -- ++ -- Michael Vogt Tue, 16 May 2006 21:51:16 +0200 apt (0.6.44) unstable; urgency=low