Changeset 1585 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Base.pm

Timestamp:

May 24, 2012, 12:12:08 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix pb_syntax, where a call with an exit of 0 was seen as false and thus lead to a value of -1. Now pb -h returns true

File:

• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -279 +279 @@
 sub pb_log {
 
-my $dlevel = shift;
-my $msg = shift;
+my $dlevel = shift || 0;
+my $msg = shift || "";
+
+$pbLOG = \*STDOUT if (not defined $pbLOG);
 
 print $pbLOG "$msg" if ($dlevel <= $pbdebug);
@@ -372 +374 @@
 sub pb_syntax {
 
-my $exit_status = shift || -1;
-my $verbose_level = shift || 0;
+my $exit_status = shift;
+my $verbose_level = shift;
 
 my $filehandle = \*STDERR;
 
+# Don't do it upper as before as when the value is 0 
+# it is considered false and then exit was set to -1
+$exit_status = -1 if (not defined $exit_status);
+$verbose_level = 0 if (not defined $verbose_level);
+
 $filehandle = \*STDOUT if ($exit_status == 0);
 
-pod2usage( { -message => $pbsynmsg,
-             -exitval => $exit_status  ,
-             -verbose => $verbose_level,
-             -output  => $filehandle } );
+pod2usage(  -message => $pbsynmsg,
+            -exitval => $exit_status,
+            -verbose => $verbose_level,
+            -output  => $filehandle );
 }