Changeset 2287 in ProjectBuilder for devel/pb

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

Files:

• bin/pb (modified) (9 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)
• lib/ProjectBuilder/Changelog.pm (modified) (1 diff)
• lib/ProjectBuilder/Filter.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -549 +549 @@
 
  pbconfurl I<project> = file:///home/anderse/.git/project-builder-config/I<project>
- pbdefdir default = $ENV{HOME}/cache-project-builder
+ pbdefdir default = $ENV{'HOME'}/cache-project-builder
 
 The first line defines the version controlled configuration information and the second defines the root directory for project-builder to use.
@@ -622 +622 @@
 
   vepath:
-    default: $ENV{HOME}/cache-project-builder/chroot
+    default: $ENV{'HOME'}/cache-project-builder/chroot
   velist:
     default: debian-6.0-i386
@@ -2268 +2268 @@
         my ($gpgaddkey) = pb_conf_get_if("pbadditionalgpg");
         my $pbadditionalgpg;
-        $pbadditionalgpg = $gpgaddkey->{$ENV{PBPROJ}} if (defined $gpgaddkey);
+        $pbadditionalgpg = $gpgaddkey->{$ENV{'PBPROJ'}} if (defined $gpgaddkey);
         if (defined $pbadditionalgpg) {
             foreach my $k (split(/,/,$pbadditionalgpg)) {
@@ -2289 +2289 @@
     $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($sshlogin,$sshport) = pb_conf_get_if($login,$port);
-    $sshport->{$ENV{PBPROJ}} = 22 if (not defined $sshport->{$ENV{PBPROJ}});
-    $sshlogin->{$ENV{PBPROJ}} = getpwuid($UID) if (not defined $sshlogin->{$ENV{PBPROJ}});
+    $sshport->{$ENV{'PBPROJ'}} = 22 if (not defined $sshport->{$ENV{'PBPROJ'}});
+    $sshlogin->{$ENV{'PBPROJ'}} = getpwuid($UID) if (not defined $sshlogin->{$ENV{'PBPROJ'}});
     my ($vtmout,$vepath);
     # ...Except those in virtual context
@@ -2365 +2365 @@
             my ($gpgcheck) = pb_conf_get_if("pbgpgcheck");
             my $pbgpgcheck;
-            $pbgpgcheck = $gpgcheck->{$ENV{PBPROJ}} if (defined $gpgcheck);
+            $pbgpgcheck = $gpgcheck->{$ENV{'PBPROJ'}} if (defined $gpgcheck);
             my $pbgpgkey = "$pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}.pubkey";
             my ($gpgaddpkey) = pb_conf_get_if("pbadditionalgpg");
             my $pbadditionalgpg;
-            $pbadditionalgpg = $gpgaddpkey->{$ENV{PBPROJ}} if (defined $gpgaddpkey);
+            $pbadditionalgpg = $gpgaddpkey->{$ENV{'PBPROJ'}} if (defined $gpgaddpkey);
             if (defined $pbadditionalgpg) {
                 foreach my $k (split(/,/,$pbadditionalgpg)) {
@@ -4623 +4623 @@
     my $dbh = pb_connect_db();
     # For date handling
-    $ENV{LANGUAGE}="C";
+    $ENV{'LANGUAGE'}="C";
     my $firstjan = strftime("%Y-%m-%d", 0, 0, 0, 1, 0, localtime->year(), 0, 0, -1);
     my $oldfirst = strftime("%Y-%m-%d", 0, 0, 0, 1, 0, localtime->year()-1, 0, 0, -1);
@@ -5099 +5099 @@
     my $changes = "";
     foreach my $c (split(/ /,$made)) {
-        $changes .= " $ENV{'PBBUILDDIR'}/$c" if (($c =~ /\.changes$/) && (-f "$ENV{PBBUILDDIR}/$c"));
+        $changes .= " $ENV{'PBBUILDDIR'}/$c" if (($c =~ /\.changes$/) && (-f "$ENV{'PBBUILDDIR'}/$c"));
     }
     my $debsigncmd = pb_check_req("debsign",1);
@@ -5121 +5121 @@
     my @pt = pb_conf_get_if("vmlist","velist","rmlist");
     foreach my $pt (@pt) {
-        push(@dists, split(/,/, $pt->{$ENV{PBPROJ}})) if defined $pt->{$ENV{PBPROJ}};
+        push(@dists, split(/,/, $pt->{$ENV{'PBPROJ'}})) if defined $pt->{$ENV{'PBPROJ'}};
     }
     # remove any whitespace
@@ -5247 +5247 @@
 my ($projcomponent_map) = pb_conf_get_if("projcomponent");
 pb_log(2,"projcomponent = ".Dumper($projcomponent_map)."\n");
-my $projcomponent = $projcomponent_map->{$ENV{PBPROJ}};
+my $projcomponent = $projcomponent_map->{$ENV{'PBPROJ'}};
 $projcomponent ||= 'contrib';
 

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";