install-info: Improve error message when the file doesn't exist

diff --git a/ChangeLog b/ChangeLog
index 683dbc4b096348d07047a22a945dda8e47770087..93ab79c1bd25b5c3e3a229f16600767c4d9af381 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-27  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/install-info.pl: Improve error message when the
+       info file doesn't exist.
+
 2008-06-23  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/dpkg-source.pl: New option --require-valid-signature.

diff --git a/debian/changelog b/debian/changelog
index 3cd700b34f3120592295abea4c256cc3b94f2e0b..ba8bb4dc1571282a6b9b4c35299dd22cda1ab49d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Add new option --require-valid-signature to dpkg-source. Closes: #390282
   * In dpkg-query(1) document the origin of the various fields and warn that
     they are not always available. Closes: #488293
+  * Improve error message in install-info when the file doesn't exist.
+    Thanks to Thomas Hood <jdthood@yahoo.co.uk>. Closes: #107098
 
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index c65a6b09ca3d3d12a5cceb94b7e9c214bb146e9a..6377788ee99f59bbbea46756e798ce0337994615 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -156,8 +156,10 @@ if (!$remove) {
 
     if (!-f $filename && -f "$filename.gz" || $filename =~ s/\.gz$//) {
         $filename= "gzip -cd <$filename.gz |";  $pipeit= 1;
-    } else {
+    } elsif (-f $filename) {
         $filename= "< $filename";
+    } else {
+        die "$progname: File $filename not found\n";
     }
 
     if (!length($description)) {