Changeset 2287 in ProjectBuilder for devel/pb/lib

Timestamp:

Sep 4, 2017, 1:21:18 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix usage of labels in env var (normalize with 'LABEL'

Location:

devel/pb/lib/ProjectBuilder

Files:

• CMS.pm (modified) (1 diff)
• Changelog.pm (modified) (1 diff)
• Filter.pm (modified) (1 diff)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -151 +151 @@
 }
 
-pb_log(1,"pb_cms_init returns $scheme,$pburl->{$ENV{'PBPROJ'}}\n");
-return($scheme,$pburl->{$ENV{'PBPROJ'}});
+pb_log(1,"pb_cms_init returns $scheme,$pbprojurl->{$ENV{'PBPROJ'}}\n");
+return($scheme,$pbprojurl->{$ENV{'PBPROJ'}});
 }
 

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -78 +78 @@
 pb_log(2,"Entering pb_changelog - OUTPUT: $OUTPUT\n") if (defined $OUTPUT);
 # For date handling
-$ENV{LANG}="C";
+$ENV{'LANG'}="C";
 
 if ((not (defined $dtype)) || ($dtype eq "") || 

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -78 +78 @@
 @file_basenames = reverse pb_distro_to_keylist($pbos, 'all') if (defined $pbos);
 # Build list of all filter files
-foreach my $dir ("$ENV{PBROOTDIR}/pbfilter", "$ENV{PBROOTDIR}/$pbpkg/pbfilter") {
+foreach my $dir ("$ENV{'PBROOTDIR'}/pbfilter", "$ENV{'PBROOTDIR'}/$pbpkg/pbfilter") {
     foreach my $file_basename (@file_basenames) {
         my $path = "$dir/${file_basename}.yml";