[SCM] Debian package checker branch, master, updated. 2.1.0-21-gd15f010

["Adam D. Barratt" <adam@adam-barratt.org.uk>]

The following commit has been merged in the master branch:
commit 7c8a276c6a3f662779054677c7a6d2e6022a04f1
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Sun Dec 7 15:38:01 2008 +0000

    Don't call lintian-info to print a tag's description.
    
    Use Lintian::Output's new showdescription flag instead.

diff --git a/frontend/lintian b/frontend/lintian
index fe9a823..529ca27 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -29,7 +29,6 @@ use FileHandle;
 # }}}
 
 # {{{ Global Variables
-my $lintian_info_cmd = 'lintian-info'; #Command to run for ?
 my $LINTIAN_VERSION = "<VERSION>";	#External Version number
 my $BANNER = "Lintian v$LINTIAN_VERSION"; #Version Banner - text form
 my $LAB_FORMAT = 8;		#Lab format Version Number
@@ -473,10 +472,6 @@ if (defined $LINTIAN_ROOT) {
     unless ($LINTIAN_ROOT =~ m,^/,) {
 	$LINTIAN_ROOT = "$cwd/$LINTIAN_ROOT";
     }
-    # see if it has a frontend directory
-    if (-d "$LINTIAN_ROOT/frontend") {
-        $lintian_info_cmd = "$LINTIAN_ROOT/frontend/lintian-info";
-    }
 } else {
     $LINTIAN_ROOT = '/usr/share/lintian';
 }
@@ -663,6 +658,7 @@ $Lintian::Output::GLOBAL->verbose($verbose);
 $Lintian::Output::GLOBAL->debug($debug);
 $Lintian::Output::GLOBAL->quiet($quiet);
 $Lintian::Output::GLOBAL->color($color);
+$Lintian::Output::GLOBAL->showdescription($lintian_info);
 
 # Print Debug banner, now that we're finished determining
 # the values and have Lintian::Output available
@@ -747,29 +743,6 @@ $LINTIAN_LAB = $LAB->{dir};
 
 # }}}
 
-# {{{ Setup the lintian-info pipe
-
-# pipe output through lintian-info?
-# note: if any E:/W: lines are added above this point, this block needs to
-#       be moved up
-if ($lintian_info) {
-    open(OUTPUT_PIPE, '|-', $lintian_info_cmd) or fail("cannot open output pipe to $lintian_info_cmd: $!");
-    $Lintian::Output::GLOBAL->stdout(\*OUTPUT_PIPE);
-}
-
-# Close the OUTPUT_PIPE in an END block so that we can ensure that
-# lintian-info exits before we do.  Otherwise, we may get output from
-# lintian-info after lintian exits, which can confuse the shell output.
-END {
-    if ($lintian_info) {
-	my $status = $?;
-	close OUTPUT_PIPE;
-	$Lintian::Output::GLOBAL->stdout(\*STDOUT);
-	$? = $status;
-    }
-}
-# }}}
-
 # {{{ Compile list of files to process
 
 $schedule = new Lintian::Schedule(verbose => $verbose);

-- 
Debian package checker