The following commit has been merged in the master branch:
commit 4aafa64147f1f7bfdfa8e07a3314d42b0803042a
Author: James McCoy <[email protected]>
Date: Wed Mar 20 19:33:07 2013 -0400
mk-build-deps: Skip malformed stanzas instead of outright failing.
Closes: #679631
Signed-off-by: James McCoy <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 9e91078..bc64843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ devscripts (2.13.1) UNRELEASED; urgency=low
[ James McCoy ]
* debdiff: Handle control files with odd permissions. Thanks to Julian
Gilbey for the patch. (Closes: #702610)
+ * mk-build-deps: Skip malformed stanzas instead of outright failing.
+ (Closes: #679631)
[ Dmitrijs Ledkovs ]
* wrap-and-sort: Add trailing comma option (Closes: #703323).
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index c236200..7b5d2d4 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -240,7 +240,8 @@ while ($control = shift) {
# parse() dies if the file isn't syntactically valid and returns undef
# if there simply weren't any fields parsed
unless ($ctrl->parse($fh, $descr)) {
- die "$progname: Unable to find package name in $descr\n";
+ warn "$progname: Unable to find package name in $descr\n";
+ next;
}
if (defined $pid) {
wait_child($pid, no_check => 1);
--
Git repository for devscripts
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
