Changeset 1219


Ignore:
Timestamp:
Feb 24, 2011, 11:14:27 AM (9 years ago)
Author:
bruno
Message:
  • Fix #87. This requires to update pb in the VM|RM|VE in order to work correctly.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1218 r1219  
    12301230            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES","patch");
    12311231
     1232            # We need to handle potential additional sources to upstream sources
     1233            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbsrc/","$ENV{'PBBUILDDIR'}/SOURCES","src");
     1234
    12321235            pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
    12331236            # set LANGUAGE to check for correct log messages
     
    35553558my @files;
    35563559
    3557 my $flag = "mayfail" if ($mandatory eq "patch");
     3560my $flag = "mayfail" if (($mandatory eq "patch") || ($mandatory eq "src"));
    35583561my $res;
    35593562
     
    35663569}
    35673570# If not mandatory return now
    3568 return() if (($res != 0) and ($mandatory eq "patch"));
     3571return() if (($res != 0) and (($mandatory eq "patch") || ($mandatory eq "src"));
    35693572opendir(DIR,"$dir") || die "Unable to open directory $dir";
    35703573foreach my $f (readdir(DIR)) {
     
    35723575    # Skip potential patch dir
    35733576    next if ($f =~ /^pbpatch/);
     3577    # Skip potential source dir
     3578    next if ($f =~ /^pbsrc/);
    35743579    move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
    35753580    pb_log(2,"mv $dir/$f $ddir\n");
Note: See TracChangeset for help on using the changeset viewer.