Changeset 1107


Ignore:
Timestamp:
Nov 17, 2010, 12:39:33 PM (9 years ago)
Author:
bruno
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
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1105 r1107  
    325325#
    326326# Asianux - Module-Build first for processing as needed by others
    327 osperldep asianux = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     327osperldep asianux = Module-Build,File-MimeInfo,File-BaseDir
    328328ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    329329# Fedora - Module-Build first for processing as needed by others
    330 osperldep fedora = File-MimeInfo,File-BaseDir,Mail-Sendmail
    331 ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils,perl-Module-Build,perl-Date-Manip
    332 osperldep fedora-12 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     330osperldep fedora = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
     331ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     332osperldep fedora-12 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    333333ospkgdep fedora-12 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    334 osperldep fedora-11 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     334osperldep fedora-11 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    335335ospkgdep fedora-11 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    336 osperldep fedora-10 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     336osperldep fedora-10 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    337337ospkgdep fedora-10 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    338 osperldep fedora-9 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     338osperldep fedora-9 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    339339ospkgdep fedora-9 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    340 osperldep fedora-8 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     340osperldep fedora-8 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    341341ospkgdep fedora-8 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    342 osperldep fedora-7 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     342osperldep fedora-7 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    343343ospkgdep fedora-7 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    344 osperldep fedora-6 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     344osperldep fedora-6 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    345345ospkgdep fedora-6 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    346 osperldep fedora-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     346osperldep fedora-5 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    347347ospkgdep fedora-5 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    348 osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     348osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Date-Manip
    349349ospkgdep fedora-4 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    350 # fprintd-pam
    351350# Slack - Module-Build first for processing as needed by others
    352 osperldep tgz = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     351osperldep tgz = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
    353352ospkgdep tgz = wget,make,ntp,patch
    354353# RHEL
    355 osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     354osperldep rhel-4 = Module-Build,File-MimeInfo,File-BaseDir
    356355ospkgdep rhel-4 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    357356# Tested
    358 osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     357osperldep centos-4 = Module-Build,File-MimeInfo,File-BaseDir
    359358ospkgdep centos-4 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    360359# Tested
    361 osperldep rhel-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     360osperldep rhel-5 = Module-Build,File-MimeInfo,File-BaseDir
    362361ospkgdep rhel-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    363 osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     362osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir
    364363ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
    365364# Tested
    366 osperldep rhel-6 = File-MimeInfo,File-BaseDir,Mail-Sendmail
     365osperldep rhel-6 = File-MimeInfo,File-BaseDir
    367366ospkgdep rhel-6 = wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build
    368367#
    369 osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     368osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir
    370369ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip,diffutils
    371 osperldep centos-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     370osperldep centos-3 = Module-Build,File-MimeInfo,File-BaseDir
    372371ospkgdep centos-3 = wget,make,ntp,patch,perl-DateManip,diffutils
    373372# Old RedHat - Module-Build first for processing as needed by others
    374 osperldep redhat = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     373osperldep redhat = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
    375374ospkgdep redhat = wget,make,ntp,patch,diffutils
    376375# Old SuSE - Module-Build first for processing as needed by others
    377 osperldep suse = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     376osperldep suse = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
    378377ospkgdep suse = wget,make,ntp,patch,diffutils
    379378# New OpenSuSE - Module-Build first for processing as needed by others
    380 osperldep opensuse = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
     379osperldep opensuse = Module-Build,File-MimeInfo,File-BaseDir
    381380ospkgdep opensuse = wget,make,ntp,patch,perl-Date-Manip,perl-File-HomeDir,diffutils
    382381# Mdv
    383382osperldep mandrake-10.1 = Date-Manip
    384 ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-Mail-Sendmail ,diffutils
     383ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils
    385384osperldep md =
    386 ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Mail-Sendmail,perl-Date-Manip,diffutils
     385ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils
    387386# LSB
    388 osperldep lsb = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     387osperldep lsb = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
    389388ospkgdep lsb =
    390389# Debian
     
    395394# Gentoo
    396395osperldep gen =
    397 ospkgdep gen = wget,ntp,make,patch,DateManip,File-MimeInfo,Mail-Sendmail
     396ospkgdep gen = wget,ntp,make,patch,DateManip,File-MimeInfo
    398397# Solaris - Module-Build first for processing as needed by others
    399 osperldep pkg = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir,Mail-Sendmail
     398osperldep pkg = Module-Build,Date-Manip,File-MimeInfo,File-BaseDir
    400399# Should be installaed manually first for the moment
    401400#ospkgdep pkg = wget,make,perl
     
    408407osperlver File-MimeInfo = 0.15
    409408osperlver File-BaseDir = 0.03
    410 osperlver Mail-Sendmail = 0.79
    411409
    412410# Code name for debian/ubuntu distro
  • devel/pb/bin/pb

    r1105 r1107  
    1111
    1212use strict 'vars';
     13
     14# The modules mentioned here are required by pb when used both
     15# locally or inside a VE/VM
     16# Additional required modules only used locally are called with a require
     17# in their respective section
    1318use Getopt::Long qw(:config auto_abbrev no_ignore_case);
    1419use Data::Dumper;
     
    3136use ProjectBuilder::Filter;
    3237use ProjectBuilder::Changelog;
    33 use Mail::Sendmail;
    3438
    3539# Global variables
     
    544548    require DBI;
    545549    require DBD::SQLite;
     550    require Mail::SendMail;
    546551
    547552    pb_announce();
     
    16081613        # Sign packages locally
    16091614        if ($dtype eq "rpm") {
    1610                 #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");
     1615                #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");
    16111616        } elsif ($dtype eq "deb") {
    16121617                #pb_system("debsign $made","Signing DEB packages");
  • devel/pb/lib/ProjectBuilder/CMS.pm

    r1097 r1107  
    187187        if (-d $source) {
    188188            pb_system("mkdir -p $tmp ; cd $tmp; tar -cf - -C $source . | tar xf -","Exporting $source from $scheme to $tmp ");
    189         # If source is file do not use -C with source
    190189        } else {
     190            # If source is file do not use -C with source
    191191            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 ");
    192192        }
    193193    } else {
     194        # Look at svk admin hotcopy
    194195        die "Unable to export from svk without a source defined";
    195196    }
Note: See TracChangeset for help on using the changeset viewer.