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

Timestamp:

Oct 10, 2014, 11:32:12 AM (10 years ago)

Author:

Bruno Cornec

Message:

Fix some default initializations (

undef e.g.)

• VE.pm doesn't need to have pbstep (use pbforce simply)
• Fix sbx2setupve in a docker context
• Add entries for prepve|vm|rm
• Move sandbox management into send2target so that all files to process are managed here

File:

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

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

@@ -146 +146 @@
 my $cmd=shift;
 my $cmt=shift || $cmd;
-my $verbose=shift || undef;
+my $verbose=shift;
 my $redir = "";
 
@@ -201 +201 @@
 sub pb_get_uri {
 
-my $uri = shift || undef;
+my $uri = shift;
 
 pb_log(2,"DEBUG: uri:" . (defined $uri ? $uri : '') . "\n");
@@ -252 +252 @@
 sub pb_log_init {
 
-$pbdebug = shift || 0;
-$pbLOG = shift || \*STDOUT;
+$pbdebug = shift;
+$pbLOG = shift;
+
+$pbdebug = 0 if (not defined $pbdebug);
+$pbLOG = \*STDOUT if (not defined $pbLOG);
 pb_log(1,"Debug value: $pbdebug\n");
 
@@ -278 +281 @@
 sub pb_log {
 
-my $dlevel = shift || 0;
-my $msg = shift || "";
-
+my $dlevel = shift;
+my $msg = shift;
+
+$dlevel = 0 if (not defined $dlevel);
+$msg = "" if (not defined $msg);
 $pbLOG = \*STDOUT if (not defined $pbLOG);
 
@@ -361 +366 @@
 sub pb_exit {
 
-my $ret = shift || 0;
+my $ret = shift;
+$ret = 0 if (not defined $ret);
 pb_log(0,"Please remove manually $ENV{'PBTMP'} after debug analysis\n") if ($pbdebug > 1);
 exit($ret);
@@ -426 +432 @@
 sub pb_temp_init {
 
-my $pbkeep = shift || 0;    # Do not keep temp files by default
+my $pbkeep = shift; 
+
+# Do not keep temp files by default
+$pbkeep = 0 if (not defined $pbkeep);
 
 if (not defined $ENV{'TMPDIR'}) {
@@ -504 +513 @@
 sub pb_check_requirements {
 
-my $req = shift || undef;
-my $opt = shift || undef;
-my $appname = shift || undef;
+my $req = shift;
+my $opt = shift;
+my $appname = shift;
 
 my ($req2,$opt2) = (undef,undef);