The following commit has been merged in the master branch: commit a9fd8b288a15f4ab03997c3f15ab6033c0bb0c82 Author: Guillem Jover <guil...@debian.org> Date: Sat Feb 18 20:19:38 2012 +0100
dpkg: Relax --merge-avail Packages file parser to not fail on bogus versions This makes the behaviour consistent with the other Packages file action (i.e. --update-avail). Missed in commit 357ab385750c1cb657ff95c0b34ad0a6bf6d2cdf. diff --git a/debian/changelog b/debian/changelog index 59fff5b..e287c0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ dpkg (1.16.2) UNRELEASED; urgency=low options. Closes: #367608 * Improve and clarify dpkg-shlibdeps superfluous linking warning messages. Based on a patch by Peter Eisentraut <pet...@debian.org>. Closes: #656496 + * Relax --merge-avail Packages file parser, to not fail on bogus versions. [ Raphaƫl Hertzog ] * Update Dpkg::Shlibs to look into multiarch paths when cross-building diff --git a/src/update.c b/src/update.c index 11d0623..4ef3ff4 100644 --- a/src/update.c +++ b/src/update.c @@ -87,8 +87,8 @@ updateavailable(const char *const *argv) if (cipaction->arg_int != act_avclear) count += parsedb(sourcefile, - pdb_recordavailable | pdb_rejectstatus | pdb_ignoreolder, - NULL); + pdb_recordavailable | pdb_rejectstatus | pdb_lax_parser | + pdb_ignoreolder, NULL); if (!f_noact) { writedb(availfile, wdb_dump_available); -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org