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

Timestamp:

Aug 30, 2017, 5:07:48 PM (7 years ago)

Author:

Bruno Cornec

Message:

the function to update v0 conf into v1 is now used in VCS.pm to allow
to add files generated into VCS without poluting Conf. with it
(hierarchy issues)

File:

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

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

@@ -210 +210 @@
             pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
         } elsif (-f "$p->{$ENV{'PBPROJ'}}/.pbrc") {
-            pb_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+            pb_vcs_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
             pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
             my ($pburl) = pb_conf_get("pburl");
@@ -387 +387 @@
         pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     } elsif (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") {
-        pb_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
+        pb_vcs_conf_update_v0("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb","$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
         pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
     }