[Pkg-libvirt-commits] [libguestfs] 52/156: podwrapper: Put the =encoding line at the correct place in the input (RHBZ#1109174).

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository libguestfs.

commit 9b48c5490a3dd9552800696e653648d2977cff0d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jun 13 14:22:50 2014 +0100

    podwrapper: Put the =encoding line at the correct place in the input (RHBZ#1109174).
    
    Commit c4dc70f8c43a7faae2a8698027a4ed23d316dfa0 broke the man pages
    for the Perl scripts in the tools/ directory.
    
    It inserted the =encoding line at the top of the file, instead of in
    front of the first =head1 entry, and this meant that the #!/usr/bin/perl
    and the prologue became a part of the POD, which was not intended.
    
    (cherry picked from commit 1148bd91ce2c0bebc65f9855368fd026aaf9f603)
---
 podwrapper.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/podwrapper.pl.in b/podwrapper.pl.in
index c2cb5e1..a685a4e 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # podwrapper.pl
-# Copyright (C) 2010-2012 Red Hat Inc.
+# Copyright (C) 2010-2014 Red Hat Inc.
 # @configure_input@
 #
 # This program is free software; you can redistribute it and/or modify
@@ -293,7 +293,7 @@ foreach (@verbatims) {
 die "$progname: $input: =encoding must not be present in input\n"
     if $content =~ /^=encoding/m;
 
-$content = "=encoding utf8\n\n$content";
+$content =~ s/^=head1(.*)/\n=encoding utf8\n\n=head1$1/m;
 
 if ($strict_checks) {
     # Verify sections present / not present.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git