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

Timestamp:

Sep 6, 2017, 7:36:28 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix newproj for git

handle the case now in the vcs_compliant function

File:

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

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

@@ -260 +260 @@
 
 my $pbconfpath = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";
-
-# Put under CMS the PBPROJ dir
-if ($action =~ /^newproj$/) {
-    if (! -d "$pbconfpath") {
-        # TODO: There is also the need to do 
-        # svn import svn://repo "$pbconfpath
-        # in case it doesn't exist there
-        pb_mkdir_p("$pbconfpath");
-    }
-    pb_vcs_add($pbconf{$ENV{'PBPROJ'}},"$pbconfpath");
-}
 
 #
@@ -1311 +1300 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            my $msg = "updated to ".basename("$pbconfpath");
-            $msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
-            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$pbconfpath",$msg);
+            my $msg = "Project $ENV{'PBPROJ'} creation";
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBCONFDIR'}",$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n");