[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.10-38-g8825ba9



The following commit has been merged in the master branch:
commit 8825ba9d97b7f2bb77c1d834b0eadffcd66dc696
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Jul 13 21:53:36 2012 +0200

    c/manpages: exec lexgrog directly instead of relying on sh
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/manpages b/checks/manpages
index 1c539ec..839795e 100644
--- a/checks/manpages
+++ b/checks/manpages
@@ -214,11 +214,13 @@ foreach my $file ($info->sorted_index) {
         if ($path =~ m,/man/man\d/,) {
             my $pid = open LEXGROG, '-|';
             if (not defined $pid) {
-                fail("cannot run lexgrog: $!");
+                fail "fork (lexgrog) failed: $!";
             } elsif ($pid == 0) {
                 clean_env;
-                exec "lexgrog \Q$path\E 2>&1"
-                    or fail("cannot run lexgrog: $!");
+                open STDERR, '>&', STDOUT
+                    or fail "Redirect STDERR failed: $!";
+                exec 'lexgrog', $path
+                    or fail "exec lexgrog failed: $!";
             }
             my $desc = <LEXGROG>;
             $desc =~ s/^[^:]+: \"(.*)\"$/$1/;
diff --git a/debian/changelog b/debian/changelog
index b0f5d50..8b8afe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,7 @@ lintian (2.5.11) UNRELEASED; urgency=low
       and patch.  (Closes: #680446)
   * checks/manpages{,.desc}:
     + [CW,NT] Manually do redirects and chdir rather than
-      invoking a shell when calling man.
+      invoking a shell when calling man and lexgrog.
     + [CW,NT] Be stricter with missing roff preprocessors by
       setting MANROFFSEQ to the empty string when calling man.
     + [CW,NT] Pass -Tutf8 -Z to man to skip an unused part of

-- 
Debian package checker


Reply to: