Changeset 899


Ignore:
Timestamp:
Nov 20, 2009, 2:00:28 AM (10 years ago)
Author:
bruno
Message:

r3617@localhost: bruno | 2009-11-15 13:33:01 +0100
Improve case where the build file description if undef (seen in cms2vm)

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r891 r899  
    242242
    243243# Get dependecies in the build file if not forced
    244 $deps = pb_distro_getdeps("$f", $dtype) if (not defined $deps);
     244$deps = pb_distro_getdeps($f, $dtype) if (not defined $deps);
    245245pb_log(2,"deps: $deps\n");
    246246return if ((not defined $deps) || ($deps =~ /^\s*$/));
     
    267267my $sep = $/;
    268268
    269 pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
    270269# Protection
    271270return("") if (not defined $dtype);
     271return("") if (not defined $f);
     272
     273pb_log(3,"entering pb_distro_getdeps: $dtype - $f\n");
    272274if ($dtype eq  "rpm") {
    273275    # In RPM this could include files, but we do not handle them atm.
     
    283285}
    284286pb_log(2,"regexp: $regexp\n");
    285 
    286 
    287 # Protection
    288 return("") if (not defined $f);
    289287
    290288# Preserve separator before using the one we need
  • devel/pb/bin/pb

    r898 r899  
    925925            foreach my $f (@specfile) {
    926926                if ($f =~ /\.spec$/) {
    927                     pb_distro_installdeps("$f",$dtype,$pbupd);
     927                    pb_distro_installdeps($f,$dtype,$pbupd);
    928928                    pb_system("rpmbuild $specialdef --define \'packager $ENV{'PBPACKAGER'}\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
    929929                    last;
     
    10041004            foreach my $f (@ebuildfile) {
    10051005                if ($f =~ /\.ebuild$/) {
    1006                     pb_distro_installdeps("$f",$dtype,$pbupd);
     1006                    pb_distro_installdeps($f,$dtype,$pbupd);
    10071007                    move($f,"$tmpd/$pbpkg-$pbver.ebuild");
    10081008                    pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
  • projects/qemu/.pbrc

    r850 r899  
    1414vmlogin default = pb
    1515vmport default = 2222
     16vmport pb = 2223
    1617vmmonport default = 4444
    1718
Note: See TracChangeset for help on using the changeset viewer.