Changeset 1907 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

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

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Base.pm (modified) (7 diffs)
• Conf.pm (modified) (3 diffs)
• Distribution.pm (modified) (4 diffs)
• Env.pm (modified) (1 diff)
• VE.pm (modified) (8 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);

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

@@ -78 +78 @@
 sub pb_conf_init {
 
-my $proj=shift || undef;
+my $proj=shift;
 
 pb_log(1,"Entering pb_conf_init\n");
@@ -240 +240 @@
 open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
-foreach my $p (keys %$h) {
+foreach my $p (sort keys %$h) {
     my $j = $h->{$p};
-    foreach my $k (keys %$j) {
+    foreach my $k (sort keys %$j) {
         print CONF "$p $k = $j->{$k}\n";
     }
@@ -321 +321 @@
 sub pb_conf_add_last_in_hash {
 
-my $ptr = shift || undef;
+my $ptr = shift;
 
 return if (not defined $ptr);

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

@@ -323 +323 @@
 
 # SPEC file
-my $f = shift || undef;
+my $f = shift;
 my $pbos = shift;
-my $deps = shift || undef;
+my $deps = shift;
 
 # Protection
@@ -358 +358 @@
 sub pb_distro_getdeps {
 
-my $f = shift || undef;
+my $f = shift;
 my $pbos = shift;
 
@@ -441 +441 @@
 
 my $pbos = shift;
-my $deps = shift || undef;
+my $deps = shift;
 
 return("") if ((not defined $deps) || ($deps =~ /^\s*$/));
@@ -538 +538 @@
 
 my $pbos = shift;
-my $pbconf = shift || undef;
-my $pbkey = shift || undef;
+my $pbconf = shift;
+my $pbkey = shift;
 
 return if (not defined $pbconf);

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

@@ -139 +139 @@
 sub pb_env_init {
 
-my $proj=shift || undef;
-my $pbinit=shift || undef;
+my $proj=shift;
+my $pbinit=shift;
 my $action=shift;
 my $pbkeep=shift || 0;

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

@@ -68 +68 @@
 
 my $v = shift;
-my $pbscript = shift;
-my $pbforce = shift;    
-my $pbstep= shift;          # Which step are we in (0: create, 1: setup, 2: build, 3: use)
+my $pbforce = shift;            # Which step are we in (0: create, 1: setup, 2: build, 3: use)
 my $locsnap = shift;
 my $vetype = shift;
@@ -78 +76 @@
 my $docrepo = undef;            # By default no repository for docker available
 
-pb_log(2,"Entering pb_ve_launch at step $pbstep\n");
+pb_log(2,"Entering pb_ve_launch at step $pbforce for type $vetype\n");
 # Get distro context
 my $pbos = pb_distro_get_context($v);
@@ -128 +126 @@
     my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
     
-    if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) && ($vetype ne "docker"))
+    if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
-        || (($vetype eq "docker") && ($pbstep == 0))) {
+        || (($vetype eq "docker") && ($pbforce == 0))) {
 
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
@@ -288 +286 @@
 
     # If docker, create the image and remove the now temp dir except if we had one already
-    if (($vetype eq "docker") && ($pbstep == 0)) {
+    if (($vetype eq "docker") && ($pbforce == 0)) {
         $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
         my $cmd1 = pb_check_req("docker",0);
@@ -348 +346 @@
 sub pb_ve_docker_registry {
 
-my $dockerreg = shift || undef;
+my $dockerreg = shift;
 my $wget = pb_check_req("wget",0);
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
@@ -369 +367 @@
 sub pb_ve_docker_repo {
 
-my $dockerreg = shift || undef;
+my $dockerreg = shift;
 my $docrepo = "";
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
@@ -380 +378 @@
 sub pb_ve_docker_get_image {
 
-my $pbimage = shift || undef;
+my $pbimage = shift;
 my $found = 0;
 
@@ -398 +396 @@
 sub pb_ve_get_type {
 
-my $vetype = shift || undef;
+my $vetype = shift;
 
 # Get VE context