Changeset 1186 in ProjectBuilder for devel/pb/lib

Timestamp:

Feb 14, 2011, 2:41:25 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix now pateches and sources delivery in parallel mode completely.

File:

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

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -144 +144 @@
 my $destfile=shift;
 my $pb=shift;
-
-pb_log(2,"DEBUG: From $f to $destfile\n");
+my $tuple = "unknown";
+$tuple = "$pb->{'pbos'}->{'name'}-$pb->{'pbos'}->{'version'}-$pb->{'pbos'}->{'arch'}" if (defined $pb->{'pbos'});
+
+pb_log(2,"DEBUG: From $f to $destfile (tuple: $tuple)\n");
+pb_log(3,"DEBUG($tuple): pb ".Dumper($pb)."\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile: $!";
@@ -175 +178 @@
             $tmp = "";
         } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
-            pb_log(3,"DEBUG filtering PBPATCHSRC\n");
+            pb_log(3,"DEBUG($tuple) filtering PBPATCHSRC\n");
             my $i = 0;
-            if (defined $pb->{'patches'}->{$pb->{'tuple'}}) {
-                foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+            pb_log(3,"DEBUG($tuple): pb ".Dumper($pb)."\n");
+            pb_log(3,"DEBUG($tuple): pb/patches/tuple $pb->{'patches'}->{$tuple}\n");
+            if (defined $pb->{'patches'}->{$tuple}) {
+                foreach my $p (split(/,/,$pb->{'patches'}->{$tuple})) {
+                    pb_log(3,"DEBUG($tuple) Adding patch $i ".basename($p)."\n");
                     print DEST "Patch$i:         ".basename($p).".gz\n";
                     $i++;
@@ -185 +191 @@
             $tmp = "";
         } elsif (($s =~ /^PBMULTISRC$/) && ($line =~ /^PBMULTISRC$/)) {
-            pb_log(3,"DEBUG filtering PBMULTISRC\n");
+            pb_log(3,"DEBUG($tuple) filtering PBMULTISRC\n");
             my $i = 1;
-            if (defined $pb->{'patches'}->{$pb->{'tuple'}}) {
-                foreach my $p (split(/,/,$pb->{'sources'}->{$pb->{'tuple'}})) {
+            if (defined $pb->{'patches'}->{$tuple}) {
+                foreach my $p (split(/,/,$pb->{'sources'}->{$tuple})) {
+                    pb_log(3,"DEBUG($tuple) Adding source $i ".basename($p)."\n");
                     print DEST "Source$i:         ".basename($p)."\n";
                     $i++;
@@ -195 +202 @@
             $tmp = "";
         } elsif (($s =~ /^PBPATCHCMD$/) && ($line =~ /^PBPATCHCMD$/)) {
-            pb_log(3,"DEBUG filtering PBPATCHCMD\n");
+            pb_log(3,"DEBUG($tuple) filtering PBPATCHCMD\n");
             my $i = 0;
-            if (defined $pb->{'patches'}->{$pb->{'tuple'}}) {
-                foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+            if (defined $pb->{'patches'}->{$tuple}) {
+                foreach my $p (split(/,/,$pb->{'patches'}->{$tuple})) {
+                    pb_log(3,"DEBUG($tuple) Adding patch command $i\n");
                     print DEST "%patch$i -p1\n";
                     $i++;
@@ -233 +241 @@
 my $pb=shift;
 
-my $cp = "$ENV{'PBTMP'}/".basename($destfile)."$$";
+my $cp = "$ENV{'PBTMP'}/".basename($destfile).".$$";
 copy($destfile,$cp) || die "Unable to copy $destfile to $cp";