stas 2004/04/27 10:26:29
Modified: lib/Apache Build.pm
. Changes
Log:
fix the apxs build function to not handle empty lookups as errors
Submitted by: Randy Kobes, Steve Hay
Revision Changes Path
1.162 +6 -4 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.161
retrieving revision 1.162
diff -u -u -r1.161 -r1.162
--- Build.pm 27 Apr 2004 00:27:39 -0000 1.161
+++ Build.pm 27 Apr 2004 17:26:28 -0000 1.162
@@ -168,13 +168,15 @@
chomp $val if defined $val; # apxs post-2.0.40 adds a new line
unless ($val) {
- error "'$apxs @_' failed:";
-
- if (my $error = qx($apxs @_ 2>&1)) {
+ # do we have an error or is it just an empty value?
+ my $error = qx($apxs @_ 2>&1);
+ chomp $error if defined $error; # apxs post-2.0.40 adds a new line
+ if ($error) {
+ error "'$apxs @_' failed:";
error $error;
}
else {
- error 'unknown error';
+ $val = '';
}
}
1.364 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -u -r1.363 -r1.364
--- Changes 27 Apr 2004 01:26:59 -0000 1.363
+++ Changes 27 Apr 2004 17:26:29 -0000 1.364
@@ -12,6 +12,9 @@
=item 1.99_14-dev
+fix the apxs build function to not handle empty lookups as errors
+[Randy Kobes, Steve Hay]
+
fix type casting problems in the io functions [Stas]
add support for libgtop 2.5.0+ (maintenance mode) [Stas]
