Changeset 1107 in ProjectBuilder for devel/pb

Timestamp:

Nov 17, 2010, 12:39:33 PM (15 years ago)

Author:

Bruno Cornec

Message:

r4032@localhost: bruno | 2010-11-08 15:51:53 +0100

• Change dependency on Mail::Sendmail from use to require, as it's only used in pb_announce, so not in VE/VM

Location:

devel/pb

Files:

• bin/pb (modified) (4 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -11 +11 @@
 
 use strict 'vars';
+
+# The modules mentioned here are required by pb when used both 
+# locally or inside a VE/VM
+# Additional required modules only used locally are called with a require
+# in their respective section
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
 use Data::Dumper;
@@ -31 +36 @@
 use ProjectBuilder::Filter;
 use ProjectBuilder::Changelog;
-use Mail::Sendmail;
 
 # Global variables
@@ -544 +548 @@
     require DBI;
     require DBD::SQLite;
+    require Mail::SendMail;
 
     pb_announce();
@@ -1608 +1613 @@
         # Sign packages locally
         if ($dtype eq "rpm") {
-                #pb_system("rpm --addsign --define \'_signature gpg\' --define \'_gpg_name \"$ENV{'PBPACKAGER'}\"\' --define \'__gpg_sign_cmd /usr/bin/gpg --batch --no-verbose --no-armor --no-tty --no-secmem-warning -sbo %{__signature_filename} %{__plaintext_filename} --use-agent\' $made","Signing RPM packages packages");
+                #pb_system("rpm --addsign --define \"_signature gpg\" --define \"_gpg_name $ENV{'PBPACKAGER'}\" --define \"__gpg_sign_cmd /usr/bin/gpg --batch --no-verbose --no-armor --no-tty --no-secmem-warning -sbo %{__signature_filename} %{__plaintext_filename} --use-agent\" $made","Signing RPM packages packages");
         } elsif ($dtype eq "deb") {
                 #pb_system("debsign $made","Signing DEB packages");

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -187 +187 @@
         if (-d $source) {
             pb_system("mkdir -p $tmp ; cd $tmp; tar -cf - -C $source . | tar xf -","Exporting $source from $scheme to $tmp ");
-        # If source is file do not use -C with source
         } else {
+            # If source is file do not use -C with source
             pb_system("mkdir -p ".dirname($tmp)." ; cd ".dirname($tmp)."; tar -cf - -C $src ".basename($source)." | tar xf -","Exporting $src/".basename($source)." from $scheme to $tmp ");
         }
     } else {
+        # Look at svk admin hotcopy
         die "Unable to export from svk without a source defined";
     }