Changeset 2287 in ProjectBuilder for devel/rpmbootstrap/bin/rpmbootstrap

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'

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (1 diff)

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);
     }