[Reproducible-commits] [dpkg] 50/63: dpkg-genbuildinfo: Use g_() instead of deprecated _g()

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Mar 4 17:44:45 UTC 2016


This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 5828db3fcc2706944f2525658e03e319c6bbaded
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Jan 29 15:48:32 2016 +0000

    dpkg-genbuildinfo: Use g_() instead of deprecated _g()
---
 scripts/dpkg-buildpackage.pl |  6 +++---
 scripts/dpkg-genbuildinfo.pl | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 8d375ea..0d1b901 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -578,12 +578,12 @@ if (build_has(BUILD_BINARY)) {
         my $control = Dpkg::Control::Info->new('debian/control');
         my $sec = $control->get_source->{'Section'} // '-';
         my $pri = $control->get_source->{'Priority'} // '-';
-        warning(_g('missing Section for source files')) if $sec eq '-';
-        warning(_g('missing Priority for source files')) if $pri eq '-';
+        warning(g_('missing Section for source files')) if $sec eq '-';
+        warning(g_('missing Priority for source files')) if $pri eq '-';
         withecho('dpkg-distaddfile', $buildinfo, $sec, $pri);
 
     } else {
-        warning(_g('no .dsc file, skipping .buildinfo generation'));
+        warning(g_('no .dsc file, skipping .buildinfo generation'));
     }
 }
 
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 5c5122b..573b647 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -76,7 +76,7 @@ sub set_build_type
 {
     my ($build_type, $build_option) = @_;
 
-    usageerr(_g('cannot combine %s and %s'), build_opt(), $build_option)
+    usageerr(g_('cannot combine %s and %s'), build_opt(), $build_option)
         if not build_is_default and $include != $build_type;
     $include = $build_type;
 }
@@ -91,7 +91,7 @@ sub parse_status {
     my @essential_pkgs;
     local $/ = '';
     open(my $status_fh, '<', $status)
-        or syserr(_g('cannot open %s'), $status);
+        or syserr(g_('cannot open %s'), $status);
     while (<$status_fh>) {
         next unless /^Status: .*ok installed$/m;
 
@@ -142,18 +142,18 @@ sub append_deps {
 }
 
 sub version {
-    printf _g("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
+    printf g_("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
 
-    printf _g('
+    printf g_('
 This is free software; see the GNU General Public License version 2 or
 later for copying conditions. There is NO warranty.
 ');
 }
 
 sub usage {
-    printf _g(
+    printf g_(
 'Usage: %s [<option>...]')
-    . "\n\n" . _g(
+    . "\n\n" . g_(
 "Options:
   -B                       build of only arch-specific files.
   -A                       build of only arch-indep files.
@@ -196,7 +196,7 @@ while (@ARGV) {
 	version();
 	exit(0);
     } else {
-        usageerr(_g("unknown option \`%s'"), $_);
+        usageerr(g_("unknown option \`%s'"), $_);
     }
 }
 
@@ -230,7 +230,7 @@ my $dist_count = 0;
 
 $dist_count = $dist->load($fileslistfile) if -e $fileslistfile;
 
-warning(_g('binary build with no binary artifacts found; .buildinfo will be meaningless'))
+warning(g_('binary build with no binary artifacts found; .buildinfo will be meaningless'))
     if $dist_count == 0;
 
 foreach my $file ($dist->get_files()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git



More information about the Reproducible-commits mailing list