Changeset 2287 in ProjectBuilder

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

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (4 diffs)
• pb-server/lib/ProjectBuilder.pm (modified) (1 diff)
• pb/bin/pb (modified) (9 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

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

@@ -578 +578 @@
 =item B<pb_path_expand>
 
-Expand out a path by environment variables as ($ENV{XXX}) and ~
+Expand out a path by environment variables as ($ENV{'ENVVAR'}) and ~
 
 =cut
@@ -587 +587 @@
 
 eval { $path =~ s/(\$ENV.+\})/$1/eeg; };
-$path =~ s/^\~/$ENV{HOME}/;
+$path =~ s/^\~/$ENV{'HOME'}/;
 
 return($path);

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

@@ -333 +333 @@
 
 # We do not overwrite shell settings
-$ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
-$ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
-$ENV{https_proxy} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne ""));
+$ENV{'ftp_proxy'} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
+$ENV{'http_proxy'} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
+$ENV{'https_proxy'} ||= $https_proxy if ((defined $https_proxy) && ($https_proxy ne ""));
 }
 
@@ -358 +358 @@
 confess "Missing install command for $pbos->{name}-$pbos->{version}-$pbos->{arch}" unless (defined $pbos->{install} && $pbos->{install} =~ /\w/);
 pb_apply_conf_proxy($pbos);
-pb_log(1, "ftp_proxy=$ENV{ftp_proxy}\n") if (defined $ENV{ftp_proxy});
-pb_log(1, "http_proxy=$ENV{http_proxy}\n")  if (defined $ENV{http_proxy});
-pb_log(1, "https_proxy=$ENV{https_proxy}\n")  if (defined $ENV{https_proxy});
+pb_log(1, "ftp_proxy=$ENV{'ftp_proxy'}\n") if (defined $ENV{'ftp_proxy'});
+pb_log(1, "http_proxy=$ENV{'http_proxy'}\n")  if (defined $ENV{'http_proxy'});
+pb_log(1, "https_proxy=$ENV{'https_proxy'}\n")  if (defined $ENV{'https_proxy'});
 
 # Get dependencies in the build file if not forced
@@ -497 +497 @@
 my $deps2 = "";
 # Avoid to install what is already there
-delete $ENV{COLUMNS};
+delete $ENV{'COLUMNS'};
 foreach my $p (split(/\s+/,$deps)) {
     next if $p =~ /^\s*$/o;

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

@@ -274 +274 @@
 }
 # Expand potential env variable in it
-$ENV{PBDEFDIR} = pb_path_expand($ENV{PBDEFDIR});
+$ENV{'PBDEFDIR'} = pb_path_expand($ENV{'PBDEFDIR'});
 pb_log(1,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
 
@@ -293 +293 @@
     }
 }
-$ENV{PBPROJDIR} = pb_path_expand($ENV{PBPROJDIR});
+$ENV{'PBPROJDIR'} = pb_path_expand($ENV{'PBPROJDIR'});
 
 my $pbconfpath = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}";

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

@@ -110 +110 @@
 $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
 
-my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
+my $root = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
     
 if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) {
@@ -132 +132 @@
             # Which tool is used
             my $verpmstyle = $verpmtype->{$ENV{'PBPROJ'}};
-            die "No verpmtype defined for $ENV{PBPROJ}" unless (defined $verpmstyle);
+            die "No verpmtype defined for $ENV{'PBPROJ'}" unless (defined $verpmstyle);
     
             # Get potential rbs option
@@ -306 +306 @@
             print DOCKER "FROM $pbimage\n";
             print DOCKER "MAINTAINER project-builder.org aka pb\n";
-            print DOCKER "ENV ftp_proxy $ENV{ftp_proxy}\n" if (defined $ENV{ftp_proxy});
-            print DOCKER "ENV http_proxy $ENV{http_proxy}\n" if (defined $ENV{http_proxy});
-            print DOCKER "ENV https_proxy $ENV{https_proxy}\n" if (defined $ENV{https_proxy});
+            print DOCKER "ENV ftp_proxy $ENV{'ftp_proxy'}\n" if (defined $ENV{'ftp_proxy'});
+            print DOCKER "ENV http_proxy $ENV{'http_proxy'}\n" if (defined $ENV{'http_proxy'});
+            print DOCKER "ENV https_proxy $ENV{'https_proxy'}\n" if (defined $ENV{'https_proxy'});
             # We are root in that container so no need to sudo, which is present potentially
             my $cmd2 = $pbos->{'install'};
@@ -410 +410 @@
     $vetype = $ptr->{$ENV{'PBPROJ'}};
 }
-confess "No vetype defined for $ENV{PBPROJ}" unless (defined $vetype);
-pb_log(1, "Using vetype $vetype for $ENV{PBPROJ}\n");
+confess "No vetype defined for $ENV{'PBPROJ'}" unless (defined $vetype);
+pb_log(1, "Using vetype $vetype for $ENV{'PBPROJ'}\n");
 return($vetype);
 }

devel/pb-server/lib/ProjectBuilder.pm

@@ -8 +8 @@
 
   # Configuration
-  #$self->secrets([split /:/, $ENV{BLOG_SECRETS} || 'super:s3cret']);
+  #$self->secrets([split /:/, $ENV{'BLOG_SECRETS'} || 'super:s3cret']);
 
   # Model
-  #$self->helper(pg => sub { state $pg = Mojo::Pg->new($ENV{BLOG_PG_URL}) });
+  #$self->helper(pg => sub { state $pg = Mojo::Pg->new($ENV{'BLOG_PG_URL'}) });
   $self->helper(confs => sub { state $confs = ProjectBuilder::Model::Confs->new() });
 

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -585 +585 @@
 #
 $pbos->{'install'} =~ s/sudo//g;
-if (((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne '')) || ((defined $ENV{https_proxy}) && ($ENV{https_proxy} ne '')) || ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''))) {
+if (((defined $ENV{'http_proxy'}) && ($ENV{'http_proxy'} ne '')) || ((defined $ENV{'https_proxy'}) && ($ENV{'https_proxy'} ne '')) || ((defined $ENV{'ftp_proxy'}) && ($ENV{'ftp_proxy'} ne ''))) {
     if ($pbos->{'name'} eq "opensuse") {
         # For opensuse 11.4 or 12.1 -- one of them didn't work with http_proxy or HTTP_PROXY set.
         open(PROXY, "> $vepath/etc/sysconfig/proxy") || die "can't open $vepath/etc/sysconfig/proxy: $!";
-        print PROXY "HTTP_PROXY=$ENV{http_proxy}\n" if ((defined $ENV{http_proxy}) && ($ENV{http_proxy} ne ''));
-        print PROXY "HTTPS_PROXY=$ENV{https_proxy}\n" if ((defined $ENV{https_proxy}) && ($ENV{https_proxy} ne ''));
-        print PROXY "FTP_PROXY=$ENV{ftp_proxy}\n" if ((defined $ENV{ftp_proxy}) && ($ENV{ftp_proxy} ne ''));
+        print PROXY "HTTP_PROXY=$ENV{'http_proxy'}\n" if ((defined $ENV{'http_proxy'}) && ($ENV{'http_proxy'} ne ''));
+        print PROXY "HTTPS_PROXY=$ENV{'https_proxy'}\n" if ((defined $ENV{'https_proxy'}) && ($ENV{'https_proxy'} ne ''));
+        print PROXY "FTP_PROXY=$ENV{'ftp_proxy'}\n" if ((defined $ENV{'ftp_proxy'}) && ($ENV{'ftp_proxy'} ne ''));
         close(PROXY);
     }