Changeset 1629

Timestamp:

06/05/12 04:09:50 (12 months ago)

Author:

bruno

Message:

r4911@localhost: bruno | 2012-06-05 02:56:19 +0200

• Skip env var passed with sudo in analysis of cmds to allow in sudoers to avoid env to be there

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -226 +226 @@
 
 # Command to update the distribution to latest state
-osupd du = sudo /usr/bin/apt-get update; sudo env DEBIAN_FRONTEND="noninteractive" /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
+osupd du = sudo /usr/bin/apt-get update; sudo /usr/bin/env DEBIAN_FRONTEND="noninteractive" /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
 osupd gen = sudo /usr/bin/emerge --update --deep world; sudo /usr/bin/revdep-rebuild
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
@@ -237 +237 @@
 # Chaining the commands allow to only test for what is able to be installed, 
 # not the update of the repo which may well be unaccessible if too old
-osins du = sudo /usr/bin/apt-get update ; sudo env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y --allow-unauthenticated install 
+osins du = sudo /usr/bin/apt-get update ; sudo /usr/bin/env DEBIAN_FRONTEND=noninteractive /usr/bin/apt-get -y --allow-unauthenticated install 
 osins gen = sudo /usr/bin/emerge 
 osins rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update ; sudo /usr/bin/yum -y install 

devel/pb/bin/pb

@@ -4310 +4310 @@
     # remove sudo and leading spaces
     $c =~ s/^\s*sudo\s+//;
+    # skip potential env var setup
+    $c =~ s/^\s*[\S]*env\s+\S+=\S+\s+//;
     # keep only the command, not the params
     $c =~ s/([^\s]+)\s.*$/$1/;