Changeset 1756 in ProjectBuilder

Timestamp:

May 16, 2013, 1:47:55 PM (11 years ago)

Author:

Bruno Cornec

Message:

• For opensuse 12.3 patch doesn't support the -s option. Fixed in the conf file

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/Base.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -702 +702 @@
 ospatchcmd default = /usr/bin/patch
 ospatchopt default = -s -p1
+ospatchopt opensuse-12.3 = -p1
 
 # sha method for yum repo

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -301 +301 @@
 
 my $file=shift;
-my $desc=shift || undef;
+my $desc=shift || \*STDOUT;
 my $prefix=shift;
 

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -220 +220 @@
                 my ($patchcmd,$patchopt) = pb_distro_get_param($pb->{'pbos'},pb_conf_get_if("ospatchcmd","ospatchopt"));
                 foreach my $p (split(/,/,$pb->{'patches'}->{$tuple})) {
-                    pb_log(3,"DEBUG($tuple) Adding patch command $i\n");
+                    pb_log(3,"DEBUG($tuple) Adding patch command $i ($patchopt)\n");
                     print DEST "%patch$i $patchopt\n";
                     $i++;