Changeset 1367 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm

Timestamp:

Nov 27, 2011, 3:44:49 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in the recursive function pb_list_bfiles where file handle should not be global
• patch command and option are now variables in p.conf under ospatchcmd and ospatchopt
• Add support for patches for deb family of distributions

File:

• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -20 +20 @@
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
+use ProjectBuilder::Conf;
+use ProjectBuilder::Distribution;
 use ProjectBuilder::Changelog;
 
@@ -215 +217 @@
             my $i = 0;
             if (defined $pb->{'patches'}->{$tuple}) {
+                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");
-                    print DEST "%patch$i -p1\n";
+                    print DEST "%patch$i $patchopt\n";
                     $i++;
                 }