Changeset 1198 in ProjectBuilder

Timestamp:

Feb 17, 2011, 1:20:36 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix sudoers format fr env_keep (at least on gentoo)
• Fix pb_get_sudocmds to deal correctly with additional params, and handle correctly spaces before sudo
• Add full path names on sudo commands for gentoo

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -204 +204 @@
 # Command to update the distribution to latest state
 osupd du = sudo /usr/bin/apt-get update; export DEBIAN_FRONTEND="noninteractive"; sudo /usr/bin/apt-get --quiet -y --force-yes dist-upgrade
-osupd gen = sudo emerge --update --deep world; sudo revdep-rebuild
+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
 osupd md = sudo /usr/bin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select
@@ -214 +214 @@
 # not the update of the repo which may well be unaccessible if too old
 osins du = sudo /usr/bin/apt-get update ; sudo /usr/bin/apt-get -y install 
-osins gen = sudo emerge 
+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 
 osins rhel-2.1 = sudo up2date -y 
@@ -387 +387 @@
 osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir
 # Tested
-osperldep rhel-6 = File-MimeInfo,File-BaseDir,Mail-Sendmail
+osperldep rhel-6 = File-MimeInfo,File-BaseDir
 ospkgdep rhel-6 = wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build
 #
-osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
+osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir
 ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip,diffutils
 osperldep centos-3 = Module-Build,File-MimeInfo,File-BaseDir
@@ -428 +428 @@
 # HP-UX
 # TBC
-osperldep sd = 
+osperldep sd = Pod2man,Date-Manip,File-MimeInfo
 
 # Version of the perl module as found on CPAN

devel/pb/bin/pb

@@ -2961 +2961 @@
 print PBOUT "Defaults:root !requiretty\n";
 # Keep proxy configuration while using sudo
-print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}} env_keep += \\\"http_proxy ftp_proxy\\\"\n";
+print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
 EOF
     # Try to restrict security to what is really needed
     if ($vtype =~ /^vm/) {
         my $hpath = pb_distro_get_param($pbos,pb_conf_get("ospathcmd-halt"));
-        my @sudocmds = pb_get_sudocmds($pbos,$ntpline,$hpath);
+        my @sudocmds = pb_get_sudocmds($pbos,$ntpline,"sudo $hpath");
         print SCRIPT << "EOF";
 # This is needed in order to be able on VM to halt the machine from the $pbac->{$ENV{'PBPROJ'}} account at least
@@ -3766 +3766 @@
         
 my $pbos = shift;
-my @lines = shift;
 my %sudocmds;
 
-foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@lines) {
-    next if ($c !~ /^sudo/);
-    # remove sudo
-    $c =~ s/^sudo\s+//;
-    # remove leading spaces
-    $c =~ s/^\s+//;
-    # remove ending spaces
-    $c =~ s/\s+$//;
+pb_log(2,"pb_get_sudocmds entering with lines:".Dumper(@_)."\n");
+foreach my $c (split(/;/,$pbos->{'update'}),split(/;/,$pbos->{'install'}),@_) {
+    pb_log(2,"pb_get_sudocmds analyses $c\n");
+    next if ($c !~ /^\s*sudo/);
+    # remove sudo and leading spaces
+    $c =~ s/^\s*sudo\s+//;
     # keep only the command, not the params
     $c =~ s/([^\s]+)\s.*$/$1/;
     $sudocmds{$c} = "";
 }
-pb_log(2,"pb_get_sudcomds returns ".Dumper(%sudocmds)."\n");
+pb_log(2,"pb_get_sudocmds returns ".Dumper(keys %sudocmds)."\n");
 return(keys %sudocmds);
 }