The following commit has been merged in the wheezy branch:
commit 32be387851c933c334cb3459556137950724b8e7
Author: Lincoln Myers <[email protected]>
Date: Fri May 17 08:42:56 2013 +0200
Replace non-existent _() with _g() in multiple places of the Perl code
[[email protected]:
- Fix the same mistake in scripts/dpkg-shlibdeps.pl ]
Closes: #708607
Signed-off-by: Raphaël Hertzog <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 470a3ee..9126abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ dpkg (1.16.11) UNRELEASED; urgency=low
[ Updated man page translations ]
* Japanese (TAKAHASHI Motonobu). Closes: #704240
+ [ Raphaël Hertzog ]
+ * Fix usage of non-existent _() function in multiple places of the Perl
+ code. Thanks to Lincoln Myers <[email protected]> for the patch.
+ Closes: #708607
+
-- Guillem Jover <[email protected]> Sat, 30 Mar 2013 15:48:52 +0100
dpkg (1.16.10) unstable; urgency=low
diff --git a/scripts/Dpkg/File.pm b/scripts/Dpkg/File.pm
index 46717a4..d9ed5e1 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 ad0c06f..e257369 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -142,7 +142,7 @@ my $fields = $control->get_source();
my $build_depends = defined($fields->{"Build-Depends"}) ?
$fields->{"Build-Depends"} : "";
my $build_deps = deps_parse($build_depends, build_dep => 1, reduce_arch => 1);
-error(_("error occurred while parsing %s"), "Build-Depends") unless defined
$build_deps;
+error(_g("error occurred while parsing %s"), "Build-Depends") unless defined
$build_deps;
my %dependencies;
my %shlibs;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
