The following commit has been merged in the master branch:
commit bfcdc34cdf300075fb45883a02acc61c90591b57
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Mar 2 05:27:04 2009 +0200

    u-a: Print an actual error on load open instead of an empty string
    
    Otherwise gettext would return the special msgid for the catalog.

diff --git a/ChangeLog b/ChangeLog
index 3d3b8ea..eebd8af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-02  Guillem Jover  <guil...@debian.org>
 
+       * scripts/update-alternatives.pl (load): Print an actual error on open
+       instead of an empty string.
+
+2009-03-02  Guillem Jover  <guil...@debian.org>
+
        * scripts/update-alternatives.pl: Do not use non-ASCII strings on C
        locale.
        (version): Likewise.
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 6447804..37cbd7b 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -748,7 +748,7 @@ sub load {
     my ($self, $file, $must_not_die) = @_;
     return 0 unless -s $file;
     eval {
-        open(my $fh, "<", $file) || error(_g(""), $file, $!);
+        open(my $fh, "<", $file) || error(_g("unable to read %s: %s"), $file, 
$!);
         config_helper($fh, $file);
        my $status = gl(_g("status"));
        badfmt(_g("invalid status")) unless $status =~ /^(?:auto|manual)$/;

-- 
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

Reply via email to