Changeset 1527 in ProjectBuilder

Timestamp:

May 12, 2012, 2:54:10 AM (12 years ago)

Author:

Bruno Cornec

Message:

• VE.pm: Verify that the proxy variables are passed through if we are using sudo. (Eric Anderson)

File:

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

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

@@ -92 +92 @@
     # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
     my $sudocmd="";
-    $sudocmd ="sudo " if ($EFFECTIVE_USER_ID != 0);
+    if ($EFFECTIVE_USER_ID != 0) {
+        $sudocmd ="sudo ";
+        foreach my $proxy (qw/http_proxy ftp_proxy/) {
+            if (defined $ENV{$proxy}) {
+                open(<CMD>,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
+                $_ = <CMD>;
+                chomp();
+                die "sudo not passing through env var $proxy; '$ENV{$proxy}' != '$_'\nAdd line Defaults:`whoami` env_keep += \"$proxy\" to sudoers file?" unless $_ eq $ENV{$proxy};
+            }
+        }
     # Handle cross arch on Intel based platforms
     $sudocmd = "setarch i386 $sudocmd" if (($pbos->{arch} =~ /i?86/) && ($arch eq 'x86_64'));