Changeset 1756


Ignore:
Timestamp:
May 16, 2013, 1:47:55 PM (5 years ago)
Author:
bruno
Message:
  • For opensuse 12.3 patch doesn't support the -s option. Fixed in the conf file
Location:
devel
Files:
3 edited

Legend:

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

    r1746 r1756  
    702702ospatchcmd default = /usr/bin/patch
    703703ospatchopt default = -s -p1
     704ospatchopt opensuse-12.3 = -p1
    704705
    705706# sha method for yum repo
  • devel/pb-modules/lib/ProjectBuilder/Base.pm

    r1711 r1756  
    301301
    302302my $file=shift;
    303 my $desc=shift || undef;
     303my $desc=shift || \*STDOUT;
    304304my $prefix=shift;
    305305
  • devel/pb/lib/ProjectBuilder/Filter.pm

    r1560 r1756  
    220220                my ($patchcmd,$patchopt) = pb_distro_get_param($pb->{'pbos'},pb_conf_get_if("ospatchcmd","ospatchopt"));
    221221                foreach my $p (split(/,/,$pb->{'patches'}->{$tuple})) {
    222                     pb_log(3,"DEBUG($tuple) Adding patch command $i\n");
     222                    pb_log(3,"DEBUG($tuple) Adding patch command $i ($patchopt)\n");
    223223                    print DEST "%patch$i $patchopt\n";
    224224                    $i++;
Note: See TracChangeset for help on using the changeset viewer.