Changeset 1651 in ProjectBuilder for devel/pb

Timestamp:

Oct 7, 2012, 6:07:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Avoid to emit msgs when sed -i doesn't work (as on RedHat 6.2)
• Factorize the proxy usages in pb_apply_conf_proxy and make it public (was partly done only)
• debug level is now passed to the vescrip improving debug capabilities in that script
• /dev/null shouldn't be touched on RedHat 6.2 as recreating it doesn't seem to work
• Allow usage of mayfailverbose in pb_system when both features are needed to help debuging
• Imrpove again RedHat 6.2 support up to setupve now (however needs a manual install of perl 5.6.2 to work as the minimum version for pb)

File:

• devel/pb/bin/pb (modified) (7 diffs)

devel/pb/bin/pb

@@ -2342 +2342 @@
     # For VE we need to change the owner manually
     if ($cmt =~ /^VE/) {
-        my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers");
+        my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers","quiet");
         pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
         pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac");
@@ -2528 +2528 @@
     my $pbos = pb_distro_get_context($v);
     
-    my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
-    my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
-
-    $ENV{ftp_proxy} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
-    $ENV{http_proxy} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
+    pb_apply_conf_proxy($pbos);
 
     # Launch the VMs/VEs
@@ -3084 +3080 @@
 EOF
     my $ppref = "our";
-    $ppref = "my" if (($pbos->{'name'} =~ /redhat/) && ($pbos->{'version'} =~ /^6/));
+    $ppref = "my" if (($pbos->{'name'} =~ /^redhat/) && ($pbos->{'version'} =~ /^6/));
     print SCRIPT << "EOF";
-$ppref \$pbdebug;
+$ppref \$pbdebug = $pbdebug;
 $ppref \$pbLOG;
 $ppref \$pbsynmsg = "pbscript";
@@ -3132 +3128 @@
     } elsif ($vtype eq "ve") {
         print SCRIPT << "EOF";
-# For VE we need a good null dev
-pb_system("rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null");
-
 # For VE we first need to mount some FS
 pb_system("mount -t proc /proc /proc") unless (-d "/proc/$$");
 
+# For VE we need a good null dev
+# Except for RedHat 6.2 where it's good and doesnt like being recreated
 EOF
+        print SCRIPT "pb_system('rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null')\n" unless (($pbos->{'name'} =~ /^redhat/) && ($pbos->{'version'} =~ /^6/));
     } else {
         die "Unknown virtual type $vtype";
@@ -3345 +3341 @@
         print SCRIPT "pb_system(\"$ntpline\",\"Updating time with $ntpline\",\"mayfail\");\n";
     }
-    # We may need a proxy configuration. Get it from the local env
-    my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy"));
-    my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy"));
-
-    $ENV{'ftp_proxy'} ||= $ftp_proxy if ((defined $ftp_proxy) && ($ftp_proxy ne ""));
-    $ENV{'http_proxy'} ||= $http_proxy if ((defined $http_proxy) && ($http_proxy ne ""));
-
-    if (defined $ENV{'http_proxy'}) {
-        print SCRIPT "\$ENV\{'http_proxy'\}=\"$ENV{'http_proxy'}\";\n";
-    }
-
-    if (defined $ENV{'ftp_proxy'}) {
-        print SCRIPT "\$ENV\{'ftp_proxy'\}=\"$ENV{'ftp_proxy'}\";\n";
-    }
 
     print SCRIPT << 'EOF';
     
+# We may need a proxy configuration. Get it from the local env
+pb_apply_conf_proxy($pbos);
+
 # Suse wants sudoers as 640
 if ((($pbos->{'name'} eq "sles") && (($pbos->{'version'} =~ /10/) || ($pbos->{'version'} =~ /9/))) || (($pbos->{'name'} eq "opensuse") && ($pbos->{'version'} =~ /10.[012]/))) {
@@ -3415 +3400 @@
     
 my $perldep = pb_distro_get_param($pbos,$osperldep);
+my $bashopt = "";
+$bashopt = "-x" if ($pbdebug ge 1);
+my $verbopt = "mayfail";
+$verbopt = "mayfailverbose" if ($pbdebug ge 1);
 foreach my $m (split(/,/,$perldep)) {
     # Skip empty deps
@@ -3420 +3409 @@
     my $dir = $m;
     $dir =~ s/-.*//;
-    pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | bash -e" ,"Installing perl module $m-$osperlver->{$m}","mayfail");
+    pb_system("echo \"rm -rf $m* ; wget http://search.cpan.org/CPAN/modules/by-module/$dir/$m-$osperlver->{$m}.tar.gz ; gzip -cd $m-$osperlver->{$m}.tar.gz | tar xf - ; cd $m* ; if [ -f Build.PL ]; then perl Build.PL; ./Build ; ./Build install ; else perl Makefile.PL; make ; make install ; fi; cd .. ; rm -rf $m*\" | bash -e $bashopt" ,"Installing perl module $m-$osperlver->{$m}",$verbopt);
 }
 EOF