[Reproducible-commits] [debhelper] 34/56: debhelper.pod: Improve the Perl maintscript snippet

Mattia Rizzolo mattia at mapreri.org
Sun Oct 4 17:06:18 UTC 2015


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

mapreri-guest pushed a commit to branch master
in repository debhelper.

commit d1594dad89e792947c9642e99727280e679ca64d
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Sep 5 22:20:46 2015 +0200

    debhelper.pod: Improve the Perl maintscript snippet
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod    | 11 +++++++++--
 debian/changelog |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index 480e293..091d23d 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -617,8 +617,15 @@ the set command):
   my $temp="set -e\nset -- @ARGV\n" . << 'EOF';
   #DEBHELPER#
   EOF
-  system ($temp) / 256 == 0
-  	or die "Problem with debhelper scripts: $!";
+  if (system($temp)) {
+     my $exit_code = ($? >> 8) & 0xff;
+     my $signal = $? & 0xff;
+     if ($exit_code) {
+         die("The debhelper script failed with error code: ${exit_code}");
+     } else {
+         die("The debhelper script was killed by signal: ${signal}");
+     }
+  }
 
 =head2 Automatic generation of miscellaneous dependencies.
 
diff --git a/debian/changelog b/debian/changelog
index f7500c9..ab867af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
   * Cherry-pick patch from Chris Lamb to only read the
     latest changelog entry when determing the
     SOURCE_DATE_EPOCH.
+  * Provide a better example of how to insert the debhelper
+    maintainer script snippets into a maintainer script
+    written in Perl.  Thanks to Jakub Wilk for reporting the
+    issues.  (Closes: #797904)
 
   [ Paul Tagliamonte ]
   * dh_gencontrol: Put debug debs back in the "debug" section.

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



More information about the Reproducible-commits mailing list