Changeset 1584 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

May 24, 2012, 12:10:50 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Move PBPROJ env var setuo from Env.pm to Conf.pm to have it earlier available for some calls with less context.
• Fix a bug when (ve|vm|rm)path->ENV(PBPROJ) was undefined, and expand its path when defined to support that type of definition in conf files (pbtest does it)
• getconf now loads more conf files, and calls cms_compliant

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (1 diff)

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

@@ -81 +81 @@
 
 pb_log(1,"Entering pb_conf_init\n");
+#
+# Check project name
+# Could be with env var PBPROJ
+# or option -p
+# if not defined take the first in conf file
+#
+if ((defined $ENV{'PBPROJ'}) &&
+    (not defined $proj)) {
+    pb_log(2,"PBPROJ env var setup ($ENV{'PBPROJ'}) so using it\n");
+    $proj = $ENV{'PBPROJ'};
+}
+
 if (defined $proj) {
     $ENV{'PBPROJ'} = $proj;