Changeset 2586 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Env.pm

Timestamp:

Apr 3, 2020, 2:02:03 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix #177 for svn pbconf and tested with one level

File:

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

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

@@ -300 +300 @@
 
     #
-    # Check pbconf cms compliance
+    # Check pbconf cms compliance except when creating a project as this doesn't exist yet
     #
     pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$pbconfpath/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    confess "No PBCONFDIR variable created" if ((not defined $ENV{'PBCONFDIR'}) || ($ENV{'PBCONFDIR'} eq ""));
+
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
 
@@ -327 +329 @@
         confess "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
     }
-    pb_log(1,"PBROOTDIR=$ENV{'PBROOTDIR'}\n");
+    pb_log(1,"PBROOTDIR: $ENV{'PBROOTDIR'}\n");
 
     # Adds that conf file to the list to consider
     if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") {
-        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") {
         pb_vcs_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
@@ -399 +401 @@
             @pkgs = ("$ENV{'PBPROJ'}") if (not @pkgs);
     
-            # Case where the parent dir of PBROOTDIR isn't managed yet in VCS
-            pb_mkdir_p(dirname("$ENV{'PBROOTDIR'}"));
-            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},dirname("$ENV{'PBROOTDIR'}"));
             pb_mkdir_p("$ENV{'PBROOTDIR'}");
-            pb_vcs_add_if_not_in($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}");
-            my $msg = "Project $ENV{'PBPROJ'} structure creation";
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBROOTDIR'}",$msg);
             open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") || confess "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             print CONF << "EOF";
@@ -1302 +1298 @@
     
             }
-            pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            $msg = "Project $ENV{'PBPROJ'} creation";
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBCONFDIR'}",$msg);
+            my $msg = "Project $ENV{'PBPROJ'} structure creation";
+            opendir(DIR,$ENV{'PBCONFDIR'}) || confess "Unable to open directory $ENV{'PBCONFDIR'}: $!";
+            foreach my $f (readdir(DIR)) {
+                next if ($f =~ /^\./);
+                pb_vcs_add($scheme,"$ENV{'PBCONFDIR'}/$f");
+            }
+            closedir(DIR);
+            pb_vcs_checkin($scheme,dirname($ENV{'PBCONFDIR'}),$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n");