The branch, master has been updated
via 6ec6391d8ef77b40c4748591820147ff10de300d (commit)
from 73ef29c8e8861d735534b4b6a232a205c874258d (commit)
- Shortlog ------------------------------------------------------------
6ec6391 Fix error handling in changelog/debian.pl
Summary of changes:
scripts/Dpkg/Changelog.pm | 6 ++++--
scripts/changelog/debian.pl | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 6ec6391d8ef77b40c4748591820147ff10de300d
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Jan 18 15:02:58 2008 +0100
Fix error handling in changelog/debian.pl
* scripts/changelog/debian.pl: Don't hide failures
inside eval().
* scripts/Dpkg/Changelog.pm (data2rfc822): Don't fail
if argument is undef.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 38b93a0..ffa1740 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -573,7 +573,7 @@ specified B<version> itself.
=back
-The following options also supported by all output methods but
+The following options are also supported by all output methods but
don't take version numbers as values:
=over 4
@@ -666,10 +666,12 @@ sub data2rfc822 {
}
return join "\n", @rfc822;
- } else {
+ } elsif (ref($data)) {
my $rfc822_str = $data->output;
return $rfc822_str;
+ } else {
+ return;
}
}
diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index e90373a..a00a29f 100755
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -124,3 +124,6 @@ if ($file eq '-') {
eval("print \$changes->${format}_str(\$opts)");
+if ($@) {
+ failure("%s",$@);
+}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
