The following commit has been merged in the master branch:
commit f92960114a4203692030d43dab9c83e0b37742da
Author: Lincoln Myers <[email protected]>
Date: Fri May 17 08:42:56 2013 +0200
perl: Replace non-existent function call _() with _g()
[[email protected]:
- Fix the same mistake in scripts/dpkg-shlibdeps.pl ]
Closes: #708607
Signed-off-by: Raphaël Hertzog <[email protected]>
Signed-off-by: Guillem Jover <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 4d12ddd..3bca159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -141,6 +141,9 @@ dpkg (1.17.0) UNRELEASED; urgency=low
* Improve dpkg-maintscript-helper behaviour in “Multi-Arch: same” packages
by arch-qualifying package names read from the environment. Also add
a warning about this potential problem in the manual page.
+ * Fix usage of non-existent _() function in multiple places of the Perl
+ code. Thanks to Lincoln Myers <[email protected]> for the patch.
+ Closes: #708607
[ Updated programs translations ]
* Fix typo in Spanish translation of update-alternatives.
diff --git a/scripts/Dpkg/File.pm b/scripts/Dpkg/File.pm
index d054af6..2d6b7f1 100644
--- a/scripts/Dpkg/File.pm
+++ b/scripts/Dpkg/File.pm
@@ -39,12 +39,12 @@ sub file_lock($$) {
if ($@) {
warning(_g('File::FcntlLock not available; using flock which is not
NFS-safe'));
flock($fh, LOCK_EX) ||
- syserr(_('failed to get a write lock on %s'), $filename);
+ syserr(_g('failed to get a write lock on %s'), $filename);
} else {
eval q{
my $fs = File::FcntlLock->new(l_type => F_WRLCK);
$fs->lock($fh, F_SETLKW) ||
- syserr(_('failed to get a write lock on %s'), $filename);
+ syserr(_g('failed to get a write lock on %s'), $filename);
}
}
}
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index ca4fce2..250b8bc 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -143,7 +143,7 @@ my $control = Dpkg::Control::Info->new();
my $fields = $control->get_source();
my $bd_value = deps_concat($fields->{'Build-Depends'},
$fields->{'Build-Depends-Arch'});
my $build_deps = deps_parse($bd_value, build_dep => 1, reduce_arch => 1);
-error(_('error occurred while parsing %s'), 'Build-Depends/Build-Depends-Arch')
+error(_g('error occurred while parsing %s'),
'Build-Depends/Build-Depends-Arch')
unless defined $build_deps;
my %dependencies;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
