[pkg-perl-tools] 02/02: Bring back prefix in prepare_body from 7a6c58c

[Alex Muntada]

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

alexm-guest pushed a commit to branch master
in repository pkg-perl-tools.

commit 76381acd0b4d1cceacb5dee5a878b5a613577332
Author: Alex Muntada <alexm at alexm.org>
Date:   Sat Dec 3 18:06:47 2016 +0100

    Bring back prefix in prepare_body from 7a6c58c
    
    Removing the the body prefix in 7a6c58c was a mistake because
    it only affects the patch headers, not the patch contents.
    
    Gbp-Dch: Ignore
---
 lib/Debian/PkgPerl/Message.pm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Debian/PkgPerl/Message.pm b/lib/Debian/PkgPerl/Message.pm
index f1c4d81..4510892 100644
--- a/lib/Debian/PkgPerl/Message.pm
+++ b/lib/Debian/PkgPerl/Message.pm
@@ -129,6 +129,8 @@ sub prepare_body {
     elsif ($patch) {
         # patch but no bug
 
+        my $pre = ( $opt_tracker eq 'github' ) ? '    ' : '';
+
         $body
             = "In Debian we are currently applying the following "
             . "patch to $opt_dist.\n"
@@ -136,18 +138,16 @@ sub prepare_body {
         $body = wrap( '', '', $body );
         $body .= "\n\n";
 
-        if ( $opt_tracker ne 'github' ) {
-            open my $patch_fh, '<', $patch;
-
-            while ( my $line = <$patch_fh> ) {
-                chomp($line);
-                last if $line eq '---';
-                last if $line =~ /^--- /;
-                last if $line =~ /^diff\h--git\ha\//;
-                last if $line =~ /^index\h[0-9a-f]+\.\.[0-9a-f]+\h\d*\h/;
-                next if $line =~ /^Forwarded:/;
-                $body .= $line . "\n";
-            }
+        open my $patch_fh, '<', $patch;
+
+        while ( my $line = <$patch_fh> ) {
+            chomp($line);
+            last if $line eq '---';
+            last if $line =~ /^--- /;
+            last if $line =~ /^diff\h--git\ha\//;
+            last if $line =~ /^index\h[0-9a-f]+\.\.[0-9a-f]+\h\d*\h/;
+            next if $line =~ /^Forwarded:/;
+            $body .= $pre . $line . "\n";
         }
     }
     else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git