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

Timestamp:

Jan 28, 2014, 9:10:25 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Move pb_cms_compliant fundtion into VCS.pm and rename it pb_vcs_compliant, as it was used incorrectly in Env.pm which was lower in the tree. Detected by MondoRescue 3.2 update by Corey Wirun and reported on the ML.

File:

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

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

@@ -24 +24 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
-use ProjectBuilder::CMS;
 use ProjectBuilder::VCS;
 
@@ -309 +308 @@
     # Check pbconf cms compliance
     #
-    pb_cms_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
+    pb_vcs_compliant("pbconfdir",'PBCONFDIR',"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf",$pbconf{$ENV{'PBPROJ'}},$pbinit);
 
     # Check where is our PBROOTDIR (release tag name can't be guessed the first time)
@@ -1252 +1251 @@
             }
             pb_vcs_add($pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONFDIR'});
-            pb_cms_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$pbinit);
+            my $msg = "updated to ".basename("$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}");
+            $msg = "Project $ENV{'PBPROJ'} creation" if (defined $pbinit);
+            pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}",$msg);
         } else {
             pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.pb in it\n");