Changeset 1185

Timestamp:

02/14/11 13:13:31 (2 years ago)

Author:

bruno

Message:

• Fix pb for patches and additional sources support in parallel mode which was previously broken

Location:

devel/pb

Files:

• bin/pb (modified) (14 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -822 +822 @@
 
         # Get project info on authors and log file
+        # TODO: Make it CMS aware
         $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
         $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
         $chglog = undef if (! -f $chglog);
 
+        # TODO: Make it CMS aware
         my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
         $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
@@ -838 +840 @@
 
         my %build;
-        my %patches;
-        my %sources;
         # We want to at least build for the underlying distro
         # except if a target was given, in which case we only build for it
@@ -874 +874 @@
         $pb{'proj'} = $ENV{'PBPROJ'};
         $pb{'repo'} = $ENV{'PBREPO'};
+        my %patches = ();
+        my %sources = ();
         $pb{'patches'} = \%patches;
         $pb{'sources'} = \%sources;
         pb_log(2,"DEBUG: pb: ".Dumper(%pb)."\n");
     
+        my $tmpd = "$ENV{'PBTMP'}/cms.$$";
+        pb_mkdir_p($tmpd) if (defined $pbparallel);
+
+        # Get only all.pbf filter at this stage for pbinit
+        my $ptr = pb_get_filters($pbpkg);
+
+        # TODO: Make it CMS aware
+        # Execute the pbinit script if any
+        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",\%pb);
+            chmod 0755,"$ENV{'PBTMP'}/pbinit";
+            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit","verbose");
+        }
+
         # Do not do that for website
         if (not defined $web) {
-            pb_log(0,"Build files are being generated for ...\n");
             my %virt;
             # De-duplicate similar VM/VE/RM
@@ -898 +913 @@
                 # Distro context
                 my $pbos = pb_distro_get_context($v);
+
+                # Get all filters to apply
+                my $ptr = pb_get_filters($pbpkg,$pbos);
+    
                 pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
     
@@ -912 +931 @@
                 my %bfiles = ();
                 my %pkgfiles = ();
-                $build{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} = "yes";
-    
-                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}") {
+                # Used in Filter.pm by pb_filter_file
+                $pb{'tuple'} = "$v";
+
+                $build{$v} = "yes";
+                if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'os'}") {
+                    pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'os'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+                } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}") {
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'type'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
                 } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'family'}") {
@@ -925 +948 @@
                     pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
                 } else {
-                    $build{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} = "no";
-                    next;
+                    $build{$v} = "no";
                 }
                 pb_log(2,"DEBUG bfiles: ".Dumper(\%bfiles)."\n");
     
-                # Get all filters to apply
-                my $ptr = pb_get_filters($pbpkg,$pbos);
+                if ($build{$v} ne "no") {
+                    # Apply now all the filters on all the files concerned
+                    # destination dir depends on the type of file
+                    # For patch support
+                    foreach my $f (values %bfiles,values %pkgfiles) {
+                        pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$v/".basename($f),\%pb);
+                    }
+                    # TODO: Make it CMS aware
+                    pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbpatch", \%patches, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextpatch");
+                    pb_log(2,"DEBUG patches: ".Dumper(\%patches)."\n");
+                    # TODO: Make it CMS aware
+                    pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbsrc", \%sources, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextsrc");
+                    pb_log(2,"DEBUG sources: ".Dumper(\%sources)."\n");
     
-                # Apply now all the filters on all the files concerned
-                # destination dir depends on the type of file
-                if (defined $ptr) {
-                    # For patch support
-                    $pb{'tuple'} = "$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
-                    foreach my $f (values %bfiles,values %pkgfiles) {
-                        pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/".basename($f),\%pb);
+                    if (defined $patches{$v}) {
+                        # Filter potential patches (local + remote)
+                        pb_mkdir_p("$dest/pbconf/$v/pbpatch");
+                        foreach my $pf (split(/,/,$patches{$v})) {
+                            my $pp = basename($pf);
+                            pb_cms_export($pf,undef,"$dest/pbconf/$v/pbpatch");
+                            pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbpatch/$pp",\%pb);
+                            pb_system("gzip -9f $dest/pbconf/$v/pbpatch/$pp","","quiet");
+                        }
+                    }
+                    if (defined $sources{$v}) {
+                        pb_mkdir_p("$dest/pbconf/$v/pbsrc");
+                        foreach my $pf (split(/,/,$sources{$v})) {
+                            my $pp = basename($pf);
+                            pb_cms_export($pf,undef,"$dest/pbconf/$v/pbsrc");
+                            pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbsrc/$pp",\%pb);
+                        }
                     }
                 }
-                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbpatch", \%patches, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextpatch");
-                pb_list_sfiles("$ENV{'PBROOTDIR'}/$pbpkg/pbsrc", \%sources, $pbos, "$ENV{'PBROOTDIR'}/$pbpkg/pbextsrc");
-
-                $pm->finish if (defined $pbparallel);
-            }
+
+                if (defined $pbparallel) {
+                    # Communicate results back to parent
+                    my $str = "";
+                    $str .= "build $v = $build{$v}\n" if (defined $build{$v});
+                    $str .= "patches $v = $patches{$v}\n" if (defined $patches{$v});
+                    $str .= "sources $v = $sources{$v}\n" if (defined $sources{$v});
+                    pb_set_content("$tmpd/$$","$str");
+                    $pm->finish;
+                }
+            }
+            # In the parent, we need to get the result from the children
             $pm->wait_all_children if (defined $pbparallel);
+            my $made = "";
+            my %h = ();
+            my %tmp;
+            my $pt;
+            my $k;
+
+            foreach $k (<$tmpd/*>) {
+                $made .= pb_get_content($k);
+            }
+            pb_rm_rf($tmpd);
+            pb_log(3,"MADE:\n$made");
+
+            # Rebuild local hashes
+            foreach $k (split(/\n/,$made)) {
+                if ($k =~ /^\s*([A-z0-9-_]+)\s+([[A-z0-9-_.]+)\s*=\s*(.+)$/) {
+                    $h{$1}->{$2}=$3;
+                }
+            }
+            pb_log(3,"HASH: ".Dumper(%h));
+
+            # Patches
+            pb_log(0,"Delivered and compressed patches ");
+            $pt = $h{'patches'};
+            foreach $k (split(/,/,values %$pt)) {
+                $tmp{$k} = "";
+            }
+            foreach $k (keys %tmp) {
+                $tmp{$k} = undef;
+                pb_log(0,"$k");
+            }
+            pb_log(0,"\n");
+
+            # Sources
+            pb_log(0,"Delivered additional sources ");
+            $pt = $h{'sources'};
+            foreach $k (split(/,/,values %$pt)) {
+                $tmp{$k} = "";
+            }
+            foreach $k (keys %tmp) {
+                pb_log(0,"$k");
+            }
+            pb_log(0,"\n");
+
+            # Build files
             my @found;
             my @notfound;
-            foreach my $b (keys %build) {
-                push @found,$b if ($build{$b} =~ /yes/);
-                push @notfound,$b if ($build{$b} =~ /no/);
-            }
-            pb_log(0," ... ".join(',',sort(@found))."\n");
+            $pt = $h{'build'};
+            foreach my $b (keys %$pt) {
+                push @found,$b if ($pt->{$b} =~ /yes/);
+                push @notfound,$b if ($pt->{$b} =~ /no/);
+            }
+            pb_log(0,"Build files have been generated for ... ".join(',',sort(@found))."\n") if (@found);
             pb_log(0,"No Build files found for ".join(',',sort(@notfound))."\n") if (@notfound);
-            pb_log(2,"DEBUG: patches: ".Dumper(%patches)."\n");
-            pb_log(2,"DEBUG: sources: ".Dumper(%sources)."\n");
-        }
-
-        # Get the generic filter (all.pbf) and 
-        # apply those to the non-build files including those
-        # generated by pbinit if applicable
-
-        # Get only all.pbf filter
-        my $ptr = pb_get_filters($pbpkg);
-
-        my $liste ="";
-        if (defined $filteredfiles->{$pbpkg}) {
-            foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",\%pb);
-                $liste = "$f $liste";
-            }
-        }
-        pb_log(2,"Files ".$liste."have been filtered\n");
-
-        # Do not do that for website
-        if (not defined $web) {
-            my %tmp;
-            my $warnptcflag = 0;
-            my $warnsrcflag = 0;
-            # Filter potential patches (local + remote)
-            pb_log(0,"Delivering and compressing patches ");
-            foreach my $v (keys %patches) {
-                pb_mkdir_p("$dest/pbconf/$v/pbpatch");
-                foreach my $pf (split(/,/,$patches{$v})) {
-                    my $pp = basename($pf);
-                    if ($param eq "SandBox") {
-                        $warnptcflag = 1;
-                    }
-                    pb_cms_export($pf,undef,"$dest/pbconf/$v/pbpatch");
-                    pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbpatch/$pp",\%pb);
-                    pb_system("gzip -9f $dest/pbconf/$v/pbpatch/$pp","","quiet");
-                    $tmp{$pf} = "";
+
+            # Apply filters to the non-build files
+            my $liste ="";
+            if (defined $filteredfiles->{$pbpkg}) {
+                foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
+                    pb_filter_file_inplace($ptr,"$dest/$f",\%pb);
+                    $liste = "$f $liste";
                 }
             }
-            pb_log(0,"Delivering additional sources ");
-            foreach my $v (keys %sources) {
-                pb_mkdir_p("$dest/pbconf/$v/pbsrc");
-                foreach my $pf (split(/,/,$sources{$v})) {
-                    my $pp = basename($pf);
-                    if ($param eq "SandBox") {
-                        $warnsrcflag = 1;
-                    }
-                    pb_cms_export($pf,undef,"$dest/pbconf/$v/pbsrc");
-                    pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbsrc/$pp",\%pb);
-                    $tmp{$pf} = "";
+            pb_log(2,"Files ".$liste."have been filtered\n");
+
+            # Do we have additional script to run to prepare the environement for the project ? 
+            # Then include it in the pbconf delivery
+            foreach my $pbvf (<$ENV{'PBROOTDIR'}/pbv*.pre>,<$ENV{'PBROOTDIR'}/pbv*.post>, <$ENV{'PBROOTDIR'}/pbtest*>) {
+                if (-x "$pbvf") {
+                    my $target = "$ENV{'PBDESTDIR'}/".basename($pbvf);
+                    pb_filter_file("$pbvf",$ptr,$target,\%pb);
+                    chmod 0755,"$target";
                 }
             }
-            foreach my $v (keys %tmp) {
-                pb_log(0,"$v ");
-            }
-            pb_log(0,"\n");
-            pb_log(0,"WARNING: Patches are always taken from repository not local export\n") if ($warnptcflag == 1);
-            pb_log(0,"WARNING: Sources are always taken from repository not local export\n") if ($warnsrcflag == 1);
         } else {
             # Instead call News generation
@@ -1036 +1092 @@
 
         # Prepare the dest directory for archive
-        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",\%pb);
-            chmod 0755,"$ENV{'PBTMP'}/pbinit";
-            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit","verbose");
-        }
-
-        # Do we have additional script to run to prepare the environement for the project ? 
-        # Then include it in the pbconf delivery
-        foreach my $pbvf (<$ENV{'PBROOTDIR'}/pbv*.pre>,<$ENV{'PBROOTDIR'}/pbv*.post>, <$ENV{'PBROOTDIR'}/pbtest*>) {
-            if (-x "$pbvf") {
-                my $target = "$ENV{'PBDESTDIR'}/".basename($pbvf);
-                pb_filter_file("$pbvf",$ptr,$target,\%pb);
-                chmod 0755,"$target";
-            }
-        }
-
-        # Archive dest dir
         chdir "$ENV{'PBDESTDIR'}" || die "Unable to change dir to $ENV{'PBDESTDIR'}";
         if (defined $preserve) {
@@ -1221 +1260 @@
             # We put every apps here under sys-apps. hope it's correct
             # We use pb's home dir in order to have a single OVERLAY line
-            my $tmpd = "$ENV{'HOME'}/portage/pb/sys-apps/$pbpkg";
-            pb_mkdir_p($tmpd) if (! -d "$tmpd");
+            my $tmpe = "$ENV{'HOME'}/portage/pb/sys-apps/$pbpkg";
+            pb_mkdir_p($tmpe) if (! -d "$tmpe");
             pb_mkdir_p("$ENV{'HOME'}/portage/distfiles") if (! -d "$ENV{'HOME'}/portage/distfiles");
 
             # We need to first extract the ebuild file 
-            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpd","ebuild");
+            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/","$tmpe","ebuild");
 
             # Prepare the build env for gentoo
@@ -1258 +1297 @@
                 if ($f =~ /\.ebuild$/) {
                     pb_distro_installdeps($f,$pbos);
-                    move($f,"$tmpd/$pbpkg-$pbver.ebuild");
-                    pb_system("cd $tmpd ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
+                    move($f,"$tmpe/$pbpkg-$pbver.ebuild");
+                    pb_system("cd $tmpe ; ebuild $pbpkg-$pbver.ebuild clean ; ebuild $pbpkg-$pbver.ebuild digest ; ebuild $pbpkg-$pbver.ebuild package","verbose");
                     # Now move it where pb expects it
                     pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg");
@@ -1266 +1305 @@
                         my $ntag = $pbtag;
                         $ntag =~ s/^0\.//;
-                        move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver"."_p$ntag.ebuild");
+                        move("$tmpe/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver"."_p$ntag.ebuild");
                         $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver"."_p$ntag.ebuild";
                     } else {
-                        move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild");
+                        move("$tmpe/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild");
                         $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild";
                     }
@@ -3519 +3558 @@
 my $supfiles = shift;
 
+pb_log(2,"DEBUG: entering pb_list_bfiles: ".Dumper($bfiles)."\n");
 opendir(BDIR,"$dir") || die "Unable to open dir $dir: $!";
 foreach my $f (readdir(BDIR)) {
@@ -3534 +3574 @@
 }
 closedir(BDIR);
+pb_log(2,"DEBUG: exiting pb_list_bfiles: ".Dumper($bfiles)."\n");
+}
+
+sub pb_add_coma {
+
+my $str = shift;
+my $addstr = shift;
+
+$str .= "," if (defined $str);
+$str .= $addstr;
+return($str);
 }
 
@@ -3539 +3590 @@
 
 my $sdir = shift;
-my $sources = shift;
+my $ptr = shift;
 my $pbos = shift;
 my $extdir = shift;
+
+pb_log(2,"DEBUG: entering pb_list_sfiles: ".Dumper($ptr)."\n");
+my $key = "$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
 
 # Prepare local sources for this distro - They are always applied first - May be a problem one day
 # This function works for both patches and additional sources
 foreach my $p (sort(<$sdir/*>)) {
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.all$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.all$/);
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'type'}$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'type'}$/);
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'family'}$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'family'}$/);
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}$/);
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/);
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if ((defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"}) and ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/));
-    $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "file://$p" if ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/);
+    $ptr->{$key} = pb_add_coma($ptr->{$key},"file://$p") if (($p =~ /\.all$/) || ($p =~ /\.$pbos->{'os'}$/) || ($p =~ /\.$pbos->{'type'}$/) || ($p =~ /\.$pbos->{'family'}$/) || ($p =~ /\.$pbos->{'name'}$/) || ($p =~ /\.$pbos->{'name'}-$pbos->{'version'}$/) ||($p =~ /\.$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}$/));
 }
 
 # Prepare also remote sources to be included - Applied after the local ones
-foreach my $p ("all","$pbos->{'type'}","$pbos->{'family'}","$pbos->{'name'}","$pbos->{'name'}-$pbos->{'version'}","$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
+foreach my $p ("all","$pbos->{'os'}","$pbos->{'type'}","$pbos->{'family'}","$pbos->{'name'}","$pbos->{'name'}-$pbos->{'version'}","$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}") {
     my $f = "$extdir.".".$p";
     next if (not -f $f);
@@ -3570 +3613 @@
     while (<PATCH>) {
         chomp();
-        $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "," if (defined $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"});
-        $sources->{"$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}"} .= "$_";
+        $ptr->{$key} = pb_add_coma($ptr->{$key},"$_");
     }
     close(PATCH);
 }
-pb_log(2,"DEBUG: sources: ".Dumper($sources)."\n");
+pb_log(2,"DEBUG: exiting pb_list_sfiles: ".Dumper($ptr)."\n");
 }
     

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -232 +232 @@
     # to verify the checksum will have issues (Fedora)
     # Then upstream should be notified that they need to change their rules
+    # This doesn't apply to patches or additional sources of course.
     my ($pbwf) = pb_conf_get_if("pbwf");
-    if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
+    if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}}) && ($path !~ /\/pbpatch\//) && ($path !~ /\/pbsrc\//)) {
         $destdir = dirname($destdir);
         pb_log(2,"This is a well-formed file so destdir is now $destdir\n");