Changeset 1109 in ProjectBuilder for devel/pb-modules

Timestamp:

Nov 17, 2010, 12:40:28 PM (14 years ago)

Author:

Bruno Cornec

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/pb-modules

Files:

• etc/pb.conf (modified) (2 diffs)
• etc/pb.conf.pod (modified) (3 diffs)
• lib/ProjectBuilder/Log.pm (modified) (3 diffs)
• t/Base.t (modified) (2 diffs)
• t/Log.t (modified) (2 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);