Changeset 498

Timestamp:

07/13/08 00:17:53 (5 years ago)

Author:

bruno

Message:

• DBI is only required when using announce
• Mail::Sendmail is require for variables and future use so VL needs also an update for that
• Now tht we need 2 tar files to build, VM also needs an updated pb

File:

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

devel/pb/bin/pb

@@ -28 +28 @@
 use ProjectBuilder::Filter;
 use ProjectBuilder::Changelog;
-
-# For announce only
-use DBI;
 use Mail::Sendmail;
 
@@ -443 +440 @@
     # TBC
 } elsif ($action =~ /^announce$/) {
+    # For announce only. Require avoids the systematic load of these modules
+    require DBI;
+
     pb_announce();
 } else {
@@ -1515 +1515 @@
         $key = "\Q$zero1";
 
-        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
+        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This may require the root password");
         # once this is done, we can do what we want on the VM remotely
     }
@@ -1532 +1532 @@
 our $pbLOG;
 our $pbsynmsg = "pbscript";
+our $pbdisplaytype = "text";
+our $pblocale = "";
 pb_log_init($pbdebug, $pbLOG);
 pb_temp_init();
@@ -1718 +1720 @@
 my $insdm = "rm -rf Date-Manip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz ; tar xvfz Date-Manip-5.54.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Date-Manip*";
 my $insmb = "rm -rf Module-Build* ; wget http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2808.tar.gz ; tar xvfz Module-Build-0.2808.tar.gz ; cd Module-Build* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Module-Build*";
-my $insfm = "rm -rf File-MimeInfo* ; wget http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/File-MimeInfo/File-MimeInfo-0.15.tar.gz ; tar xvfz File-MimeInfo-0.15.tar.gz ; cd File-MimeInfo* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf File-MimeInfo*";
+my $insfm = "rm -rf File-MimeInfo* ; wget http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/File-MimeInfo/File-MimeInfo-0.15.tar.gz ; tar xvfz File-MimeInfo-0.15.tar.gz ; cd File-MimeInfo* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf File-MimeInfo*";
 my $insfb = "rm -rf File-Basedir* ; wget http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/File-BaseDir-0.03.tar.gz ; tar xvfz File-BaseDir-0.03.tar.gz ; cd File-BaseDir* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf File-BaseDir*";
+my $insms = "rm -rf Mail-Sendmail* ; wget http://search.cpan.org/CPAN/authors/id/M/MI/MIVKOVIC/Mail-Sendmail-0.79.tar.gz ; tar xvfz Mail-Sendmail-0.79.tar.gz ; cd Mail-Sendmail* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf Mail-Sendmail*";
 my $cmtdm = "Installing Date-Manip perl module";
 my $cmtmb = "Installing Module-Build perl module";
 my $cmtfm = "Installing File-MimeInfo perl module";
 my $cmtfb = "Installing File-Basedir perl module";
+my $cmtms = "Installing Perl-Sendmail perl module";
 my $cmtall = "Installing required modules";
 
@@ -1736 +1740 @@
     }
 
-    pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-File-MimeInfo perl-ExtUtils-MakeMaker",$cmtall);
+    pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-File-MimeInfo perl-ExtUtils-MakeMaker perl-Mail-Sendmail",$cmtall);
     if ($dver eq 4) {
         pb_system("$insmb","$cmtmb");
@@ -1749 +1753 @@
     pb_system("$insfm","$cmtfm");
     pb_system("$insfb","$cmtfb");
+    pb_system("$insms","$cmtms");
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
@@ -1754 +1759 @@
     pb_system("$insfm","$cmtfm");
     pb_system("$insfb","$cmtfb");
-    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
+    pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
 } elsif ( $dfam eq "md" ) {
-        pb_system("urpmi.update -a ; urpmi --auto rpm-build wget sudo patch ntp-client perl-File-MimeInfo","$cmtall");
+        pb_system("urpmi.update -a ; urpmi --auto rpm-build wget sudo patch ntp-client perl-File-MimeInfo perl-Mail-Sendmail","$cmtall");
         if (($ddir eq "mandrake") && ($dver eq "10.1")) {
             pb_system("$insdm","$cmtdm");
@@ -1767 +1772 @@
         pb_system("$insfb","$cmtfb");
         pb_system("$insfm","$cmtfm");
-        pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl","$cmtall");
+        pb_system("apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl libmail-sendmail-perl","$cmtall");
     } else  {
-        pb_system("apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl","$cmtall");
+        pb_system("apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl libmail-sendmail-perl","$cmtall");
     }
 } elsif ( $dfam eq "gen" ) {
         #system "emerge -u system";
-        pb_system("emerge wget sudo ntp DateManip File-MimeInfo","$cmtall");
+        pb_system("emerge wget sudo ntp DateManip File-MimeInfo Mail-Sendmail","$cmtall");
 } else {
     pb_log(0,"No pkg to install\n");