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 38b93a01e1d2c564ef36a329479ab17fc26b54db..ffa1740eea09b3cbee2f3bd2f4019443f40d402c 100644 (file)
--- 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 e90373a8e654ee80a46f9593e677a46fff8aea74..a00a29fe2eb070970378427786a17e5ea116b6f7 100755 (executable)
--- 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",$@);
+}