Changeset 1109

Timestamp:

11/17/10 12:40:28 (3 years ago)

Author:

bruno

Message:

r4041@localhost: bruno | 2010-11-17 11:40:41 +0100

• Adds new configuration parameters (oschkcmd, oschkopt) to externalize package checking command
• Adds new configuration parameters (pbinstalltype, pbpkg) to start allowing installation of pb in VM/VE with packages or files (this last is only needed by upstream)
• Remove dependency on Mail::Sendmail to where it's really needed (part of Log, not used yet, and annouce). In particular this removes one non std dep for VE/VM build.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb-modules/etc/pb.conf.pod (modified) (3 diffs)
• pb-modules/lib/ProjectBuilder/Log.pm (modified) (3 diffs)
• pb-modules/t/Base.t (modified) (2 diffs)
• pb-modules/t/Log.t (modified) (2 diffs)
• pb/bin/pb (modified) (6 diffs)

devel/pb-modules/etc/pb.conf

@@ -405 +405 @@
 #ospkgdep pkg = wget,make,perl
 # And also need ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/sudo-1.7.2p1-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/sparc/10/make-3.81-sol10-sparc-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libintl-3.4.0-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libiconv-1.9.2-sol10-x86-local.gz ftp://ftp.sunfreeware.com/pub/freeware/intel/10/libgcc-3.4.6-sol10-x86-local.gz
+#
 
 # Version of the perl module as found on CPAN
@@ -436 +437 @@
 #oscmdopt rpmbootstrap = 
 #
+# Commands to check packages
+#
+oschkcmd rpm = /usr/bin/rpmlint
+oschkopt rpm = 
+oschkcmd deb = /usr/bin/lintian
+oschkopt deb = 

devel/pb-modules/etc/pb.conf.pod

@@ -70 +70 @@
  Conffile: pb
  Example: osambiguous debian = debian,ubuntu
+
+=item B<oschkcmd>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package checker tool.
+ Conffile: pb
+ Example: oschkcmd deb = /usr/bin/lintian
+
+=item B<oschkopt>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package checker tool options.
+ Conffile: pb
+ Example: oschkcmd rpm = -i
 
 =item B<oscodename>
@@ -200 +216 @@
  Example: pbdefdir default = $ENV{'HOME'}/local/pb/projects
 
+=item B<pbinstalltype>
+
+ Nature: Mandatory
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: file or pkg. Indicates how pb will be installed during the setupve|vm phase in the virtual environment|machine, using CPAN files or upstream packages. Only the dev team needs to use file as packages do not yet exist for it. Or when no repository exists to pull project-builder.org from.
+ Conffile: pb
+
 =item B<pbml>
 
@@ -215 +238 @@
  Conffile: project
  Example: pbpackager pb = Bruno Cornec <bruno@project-builder.org>
+
+=item B<pbpkg>
+
+ Nature: Optional (Mandatory if pbinstalltype is pkg)
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: coma separated list of packages that have to be installed in order for pb to be operational in the VE|VM
+ Conffile: pb
+ Example: pbpkg rhel-5 = project-builder
 
 =item B<pbprojdir>

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

@@ -5 +5 @@
 
 use strict;
-use Mail::Sendmail;
 use ProjectBuilder::Base;
 use ProjectBuilder::Log::Item;
@@ -227 +226 @@
 # mails the summary to $to
 sub mailSummary {
+    require Mail::Sendmail;
     my $self = shift;
     my $to = shift || "";
@@ -239 +239 @@
         Message => $self->summary()
     );
-    sendmail(%mail) or return $Mail::Sendmail::error;
+    if (! sendmail(%mail)) { 
+        if (defined $Mail::Sendmail::error) {
+            return $Mail::Sendmail::error;
+        } else {
+            return "Unkown error";
+        }
+    }
     pb_log(0,"Mail send to ". $to ."\n");
 }

devel/pb-modules/t/Base.t

@@ -5 +5 @@
 use strict;
 use ProjectBuilder::Base;
-use Test;
 
 eval
@@ -15 +14 @@
 # Test::More not found so no test will be performed here
 if ($@) {
-    BEGIN { plan tests => 1 };
+    require Test;
+    plan(tests => 1);
     print "# Faking tests as test::More is not available\n";
     ok(1,1);

devel/pb-modules/t/Log.t

@@ -5 +5 @@
 use strict;
 use ProjectBuilder::Base;
-use Test;
 
 eval
@@ -15 +14 @@
 # Test::More not found so no test will be performed here
 if ($@) {
-    BEGIN { plan tests => 1 };
+    require Test;
+    plan(tests => 1);
     print "# Faking tests as test::More is not available\n";
     ok(1,1);

devel/pb/bin/pb

@@ -1148 +1148 @@
         }
     }
+    # Find the appropriate check cmd/opts
+    my ($oschkcmd,$oschkopt) = pb_conf_get_if("oschkcmd","oschkopt");
+    my $chkcmd .= pb_distro_get_param($ddir,$dver,$arch,$oschkcmd,$dtype,$dfam,$dos);
+    my $chkopt .= pb_distro_get_param($ddir,$dver,$arch,$oschkopt,$dtype,$dfam,$dos);
+
     # Packages check if needed
     if ($dtype eq "rpm") {
-        if (-f "/usr/bin/rpmlint") {
-            pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
+        if (-x $chkcmd) {
+            pb_system("$chkcmd $chkopt $made","Checking validity of rpms with $chkcmd","verbose");
         }
         my $rpms ="";
@@ -1166 +1171 @@
             $made2 .= "../$f " if ($f =~ /\.changes$/);
         }
-        if (-f "/usr/bin/lintian") {
-            pb_system("lintian $made2","Checking validity of debs with lintian","verbose");
+        if (-x $chkcmd) {
+            pb_system("$chkcmd $chkopt $made2","Checking validity of debs with $chkcmd","verbose");
         } else {
             pb_log(0,"deb packages generated: $made2\n");
@@ -2560 +2565 @@
     print SCRIPT << 'EOF';
     
-    my ($ospkgdep,$osperldep,$osperlver) = pb_conf_get_if("ospkgdep","osperldep","osperlver");
-    
-    # First install all required packages
-    pb_system("yum clean all","Cleaning yum env") if (($ddir eq "fedora") || ($ddir eq "asianux") || ($ddir eq "rhel"));
-    my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
-    pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
-
-    # Then install manually the missing perl modules
-    my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype,$dos);
-    foreach my $m (split(/,/,$perldep)) {
-        # Skip empty deps
-        next if ($m =~ /^\s*$/);
-        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" ,"Installing perl module $m-$osperlver->{$m}");
-    }
-
 # Suse wants sudoers as 640
 if ((($ddir eq "sles") && (($dver =~ /10/) || ($dver =~ /9/))) || (($ddir eq "opensuse") && ($dver =~ /10.[012]/))) {
@@ -2582 +2570 @@
 }
 
+# First install all required packages
+pb_system("yum clean all","Cleaning yum env") if (($ddir eq "fedora") || ($ddir eq "asianux") || ($ddir eq "rhel"));
+my ($ospkgdep) = pb_conf_get_if("ospkgdep");
+    
+my $pkgdep = pb_distro_get_param($ddir,$dver,$darch,$ospkgdep,$dfam,$dtype,$dos);
+pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgdep))));
+
+EOF
+    my $itype = pb_conf_get("pbinstalltype");
+    if ($itype->{$ENV{'PBPROJ'}} =~ /^file/) {
+        print SCRIPT << 'EOF';
+# Then install manually the missing perl modules
+my ($osperldep,$osperlver) = pb_conf_get_if("osperldep","osperlver");
+    
+my $perldep = pb_distro_get_param($ddir,$dver,$darch,$osperldep,$dfam,$dtype,$dos);
+foreach my $m (split(/,/,$perldep)) {
+    # Skip empty deps
+    next if ($m =~ /^\s*$/);
+    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" ,"Installing perl module $m-$osperlver->{$m}");
+}
+
 pb_system("rm -rf ProjectBuilder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/ProjectBuilder-latest.tar.gz ; gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
+EOF
+    } elsif ($itype->{$ENV{'PBPROJ'}} =~ /^pkg/) {
+        # pkg based install. We need to point to the project-builder.org repository
+        print SCRIPT << 'EOF';
+my ($pbpkg) = pb_conf_get_if("pbpkg");
+
+my $pkgforpb = pb_distro_get_param($ddir,$dver,$darch,$pbpkg,$dfam,$dtype,$depdos);
+pb_distro_setuprepo($ddir,$dver,$darch,$dtype);
+pb_distro_installdeps(undef,$dtype,$pbupd,pb_distro_only_deps_needed($dtype,join(' ',split(/,/,$pkgforpb))));
+EOF
+    } else {
+        # Unknown install type
+        die("Unknown install type $itype->{$ENV{'PBPROJ'}} for param pbinstalltype");
+    }
+    print SCRIPT << 'EOF';
 pb_system("pb 2>&1 | head -5",undef,"verbose");
 EOF
@@ -2877 +2903 @@
     
     # Preparation of headers
+    require Mail::Sendmail;
 
     my %mail = (    
@@ -2887 +2914 @@
             
     # Send mail
-    sendmail(%mail) or die "Unable to send mail ($Mail::Sendmail::error): $Mail::Sendmail::log";
+    if (! sendmail(%mail)) {
+        if ((defined $Mail::Sendmail::error) and (defined $Mail::Sendmail::log)) {
+            die "Unable to send mail ($Mail::Sendmail::error): $Mail::Sendmail::log";
+        }
+    }
 }