Changeset 1651 in ProjectBuilder

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)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (4 diffs)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (7 diffs)

devel/pb-modules/etc/pb.conf

@@ -296 +296 @@
 # On RedHat 6.2 we do not give any package here to avoid problems to add them as there is no repo nor yum mecanism
 osmindep redhat =
-osmindep redhat-6.2 =
+osmindep redhat-6.2 = ftp://ftp.pbone.net/mirror/archive.download.redhat.com/pub/redhat/linux/6.2/en/powertools/i386/i386/sudo-1.6.1-1.i386.rpm
 osmindep default = perl,sudo,wget,tar,make,gzip
 
 # These deps are needed for rpmbootstrap to install a base distribution
 # Originally reuse from rinse conf files
-rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,perl,popt,procps,psmisc,pwdb,python,readline,rpm,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,zlib
+rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,patch,perl,popt,procps,psmisc,pwdb,python,readline,redhat-release,rpm,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,xntp3,zlib
 #
 rbsmindep fedora-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,zlib
@@ -533 +533 @@
 # Old RedHat - Module-Build first for processing as needed by others
 osperldep redhat = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
-ospkgdep redhat = wget,make,ntp,patch,diffutils
+ospkgdep redhat =
 # Old SuSE - Module-Build first for processing as needed by others
 osperldep suse = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
@@ -652 +652 @@
 ospkg default = project-builder
 # Where is the associated repo
+osrepo redhat-6.2 =
 osrepo rpm = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}/pb.repo
 osrepo deb = ftp://ftp.project-builder.org/$pbos->{'name'}/$pbos->{'version'}/pb.sources.list
@@ -673 +674 @@
 ossha rpm = sha256
 # RHEL before 6 had python 2.4
+ossha redhat-6.2 = sha
 ossha rhel-2.1 = sha
 ossha rhel-3 = sha

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

@@ -135 +135 @@
 The first parameter is the shell command to call. This command should NOT use redirections.
 The second parameter is the message to print on screen. If none is given, then the command is printed.
-The third parameter prints the result of the command after correct execution if value is "verbose". If value is "noredir", it avoids redirecting outputs (e.g. for vi). If value is "quiet", doesn't print anything at all. If value is "mayfail", failure of the command is ok even if $Global::pb_stop_on_error is set, because the caller will be handling the error. 
+The third parameter prints the result of the command after correct execution if value is "verbose". If value is "noredir", it avoids redirecting outputs (e.g. for vi). If value is "quiet", doesn't print anything at all. If value is "mayfail", failure of the command is ok even if $Global::pb_stop_on_error is set, because the caller will be handling the error. A "verbose" can be added to mayfail to have it explain why it failed
 This function returns as a result the return value of the system command.
 
@@ -160 +160 @@
 my $res = $?;
 # Exit now if the command may fail
-if ((defined $verbose) and ($verbose eq "mayfail")) {
+if ((defined $verbose) and ($verbose =~ /mayfail/)) {
     pb_log(0,"NOT OK but non blocking\n") if ($res != 0);
     pb_log(0,"OK\n") if ($res == 0);
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose =~ /verbose/));
     return($res) 
 }
@@ -178 +179 @@
         confess("ERROR running command ($cmd) with cwd=$cwd, pid=$$");
     } else {
-        pb_log(0,"ERROR running command ($cmd) with cwd=$cwd, pid=$$");
+        pb_log(0,"ERROR running command ($cmd) with cwd=$cwd, pid=$$\n");
     }
 } else {

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist);
+our @EXPORT = qw(pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_apply_conf_proxy);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -306 +306 @@
 
 # We do not overwrite shell settings
-$ENV{ftp_proxy} ||= $ftp_proxy;
-$ENV{http_proxy} ||= $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 ""));
 }
 

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