perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: modperl-2.0/lib/Apache Build.pm
Date Fri, 07 Nov 2003 08:48:21 GMT
randyk      2003/11/07 00:48:21

  Modified:    perl-framework/Apache-Test Makefile.PL
               perl-framework/Apache-Test/lib/Apache TestConfig.pm
               lib/Apache Build.pm
  Log:
  Reviewed by:	stas
  use devnull() from File::Spec to specify a portable /dev/null.
  
  Revision  Changes    Path
  1.14      +1 -0      httpd-test/perl-framework/Apache-Test/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Makefile.PL,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Makefile.PL	18 Jun 2003 08:55:57 -0000	1.13
  +++ Makefile.PL	7 Nov 2003 08:48:21 -0000	1.14
  @@ -38,6 +38,7 @@
   WriteMakefile(
       NAME      => 'Apache::Test',
       VERSION   => $VERSION,
  +    PREREQ_PM => { 'File::Spec' => '0.8' },
       dist      => {
           COMPRESS => 'gzip -9f', SUFFIX=>'gz',
       },
  
  
  
  1.182     +3 -2      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- TestConfig.pm	21 Oct 2003 22:09:41 -0000	1.181
  +++ TestConfig.pm	7 Nov 2003 08:48:21 -0000	1.182
  @@ -23,7 +23,7 @@
   use File::Basename qw(dirname);
   use File::Path ();
   use File::Spec::Functions qw(catfile abs2rel splitdir canonpath
  -                             catdir file_name_is_absolute);
  +                             catdir file_name_is_absolute devnull);
   use Cwd qw(fastcwd);
   
   use Apache::TestConfigPerl ();
  @@ -1420,7 +1420,8 @@
   sub apxs {
       my($self, $q, $ok_fail) = @_;
       return unless $self->{APXS};
  -    my $val = qx($self->{APXS} -q $q 2>/dev/null);
  +    my $devnull = devnull();
  +    my $val = qx($self->{APXS} -q $q 2>$devnull);
       chomp $val if defined $val; # apxs post-2.0.40 adds a new line
       unless ($val) {
           if ($ok_fail) {
  
  
  
  1.150     +3 -2      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- Build.pm	5 Nov 2003 09:45:22 -0000	1.149
  +++ Build.pm	7 Nov 2003 08:48:21 -0000	1.150
  @@ -6,7 +6,7 @@
   
   use Config;
   use Cwd ();
  -use File::Spec::Functions qw(catfile catdir canonpath rel2abs);
  +use File::Spec::Functions qw(catfile catdir canonpath rel2abs devnull);
   use File::Basename;
   use ExtUtils::Embed ();
   
  @@ -127,7 +127,8 @@
           return defined $val ? ($val ? "$prefix/$val" : $prefix) : "";
       }
   
  -    my $val = qx($apxs @_ 2>/dev/null);
  +    my $devnull = devnull();
  +    my $val = qx($apxs @_ 2>$devnull);
       chomp $val if defined $val; # apxs post-2.0.40 adds a new line
   
       unless ($val) {
  
  
  

Mime
View raw message