Changeset 2310 in ProjectBuilder for devel/pb-modules

Timestamp:

Sep 6, 2017, 9:08:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

Create pb_env_create_dirs to allow later directory creation

File:

• devel/pb-modules/lib/ProjectBuilder/Env.pm (modified) (4 diffs)

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

@@ -281 +281 @@
     closedir(DIR);
 }
-if (! -d "$ENV{'PBDESTDIR'}") {
-    pb_mkdir_p($ENV{'PBDESTDIR'});
-}
 
 #
@@ -289 +286 @@
 #
 $ENV{'PBBUILDDIR'}="$pbconfpath/pbbuild";
-if (! -d "$ENV{'PBBUILDDIR'}") {
-    pb_mkdir_p($ENV{'PBBUILDDIR'});
-}
 
 pb_log(1,"PBBUILDDIR: $ENV{'PBBUILDDIR'}\n");
@@ -1306 +1300 @@
         }
     }
+    pb_env_create_dirs();
     umask 0022;
     return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
 } elsif ($action =~ /^(newv|setupv)/) {
+    pb_env_create_dirs();
     # No PBDESTDIR yet so doing nothing
     return;
 } else {
+    pb_env_create_dirs();
+
     # Setup the variables from what has been stored at the end of cms2build
     my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","pbroot");
@@ -1328 +1326 @@
 }
 }
+sub pb_env_create_dirs {
+if (! -d "$ENV{'PBDESTDIR'}") {
+    pb_mkdir_p($ENV{'PBDESTDIR'});
+}
+if (! -d "$ENV{'PBBUILDDIR'}") {
+    pb_mkdir_p($ENV{'PBBUILDDIR'});
+}
+}
 
 =head1 WEB SITES