[Reproducible-commits] [dpkg] 46/61: scripts: Use error() and errormsg() instead of printing on STDERR directly

[Jérémy Bobbio]

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

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

commit d287060bb1a45f5de33eb27034a7d8b27b039dbb
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Sep 17 18:14:00 2015 +0200

    scripts: Use error() and errormsg() instead of printing on STDERR directly
    
    This way any transformation done for error messages gets applied
    consistently to all error output.
---
 scripts/Dpkg/Source/Package/V1.pm | 3 +--
 scripts/dpkg-checkbuilddeps.pl    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index db81962..b123f79 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -403,8 +403,7 @@ sub do_build {
     }
 
     if ($ur) {
-        printf { *STDERR } g_('%s: unrepresentable changes to source') . "\n",
-               $Dpkg::PROGNAME;
+        errormsg(g_('unrepresentable changes to source'));
         exit(1);
     }
 }
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index ba3fa90..ee208bb 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -138,12 +138,12 @@ if ($bc_value) {
 }
 
 if (@unmet) {
-	printf { *STDERR } g_('%s: Unmet build dependencies: '), $Dpkg::PROGNAME;
-	print { *STDERR } join(' ', map { $_->output() } @unmet), "\n";
+	error(g_('Unmet build dependencies: %s'),
+	      join(' ', map { $_->output() } @unmet));
 }
 if (@conflicts) {
-	printf { *STDERR } g_('%s: Build conflicts: '), $Dpkg::PROGNAME;
-	print { *STDERR } join(' ', map { $_->output() } @conflicts), "\n";
+	error(g_('Build conflicts: %s'),
+	      join(' ', map { $_->output() } @conflicts));
 }
 exit 1 if @unmet || @conflicts;
 

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