Changeset 500

Timestamp:

08/03/08 13:20:30 (5 years ago)

Author:

bruno

Message:

• Working patch support added to pb (tested with buffer)
• Filtering functions now handle also pointer on hashes (such as the new pb hash)
• Filtering functions support new macro for patch support (PBPATCHSRC and PBPATCHCMD)
• Env.pm now generates correct templates for patch support and uses the new pb hash
• pb_cms_export extended to support  file:// URI, and also supports an undef second param (no local export available)
• In pb, hashes now include also the arch (for better patch support)
• pb supports local CMS based patches, as well as external references (not tested yet)
• New pb_get_arch function provided
• New parameters for pb_system (mayfail and quiet)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb/bin/pb (modified) (15 diffs)
• pb/lib/ProjectBuilder/CMS.pm (modified) (8 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (5 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (3 diffs)

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

@@ -152 +152 @@
 my $redir = "";
 
-pb_log(0,"$cmt... ");
+pb_log(0,"$cmt... ") if ($verbose ne "quiet");
 pb_log(1,"Executing $cmd\n");
 unlink("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
@@ -158 +158 @@
 system("$cmd $redir");
 my $res = $?;
+# Exit now if the command may fail
+if ((defined $verbose) and ($verbose eq "mayfail")) {
+    pb_log(0,"N/A\n") if ($res != 0);
+    pb_log(0,"OK\n") if ($res == 0);
+    return($res) 
+    }
 if ($res == -1) {
-    pb_log(0,"failed to execute ($cmd): $!\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0,"failed to execute ($cmd): $!\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } elsif ($res & 127) {
-    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } elsif ($res == 0) {
-    pb_log(0,"OK\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) && (-f "$ENV{'PBTMP'}/system.log"));
+    pb_log(0,"OK\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 } else {
-    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
+    pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n") if ($verbose ne "quiet");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((-f "$ENV{'PBTMP'}/system.log") and ($verbose ne "quiet"));
 }
 return($res);

devel/pb/bin/pb

@@ -521 +521 @@
         my @pt;
         my $tmpl = "";
-        my @patches = ();
+        my %patches;
 
         @pt = pb_conf_get_if("vmlist","velist");
@@ -547 +547 @@
         $pb{'proj'} = $ENV{'PBPROJ'};
         $pb{'repo'} = $ENV{'PBREPO'};
+        $pb{'patches'} = \%patches;
+        pb_log(2,"DEBUG: pb: ".Dumper(%pb)."\n");
 
         foreach my $d (split(/,/,$tmpl)) {
@@ -563 +565 @@
             my %bfiles = ();
             my %pkgfiles = ();
-            $build{"$ddir-$dver"} = "yes";
+            $build{"$ddir-$dver-$arch"} = "yes";
 
             if (-d "$ENV{'PBROOTDIR'}/$pbpkg/$pb{'dtype'}") {
@@ -573 +575 @@
             } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver") {
                 pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
+            } elsif (-d "$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver-$arch") {
+                pb_list_bfiles("$ENV{'PBROOTDIR'}/$pbpkg/$ddir-$dver-$arch",$pbpkg,\%bfiles,\%pkgfiles,$supfiles);
             } else {
-                $build{"$ddir-$dver"} = "no";
+                $build{"$ddir-$dver-$arch"} = "no";
                 next;
             }
@@ -582 +586 @@
             my $ptr = pb_get_filters($pbpkg, $pb{'dtype'}, $dfam, $ddir, $dver);
 
-            # Prepare patches for this distro
+            # Prepare local patches for this distro - They are always applied first - May be a problem one day
             foreach my $p (sort(<$ENV{'PBROOTDIR'}/$pbpkg/pbpatch/*>)) {
-                push @patches,$p if ($p =~ /\.all$/);
-                push @patches,$p if ($p =~ /\.$pb{'dtype'}$/);
-                push @patches,$p if ($p =~ /\.$dfam$/);
-                push @patches,$p if ($p =~ /\.$ddir$/);
-                push @patches,$p if ($p =~ /\.$ddir-$dver$/);
-            }
-            $pb{'patches'} = \@patches;
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.all$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.all$/);
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.$pb{'dtype'}$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$pb{'dtype'}$/);
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.$dfam$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$dfam$/);
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir$/);
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir-$dver$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir-$dver$/);
+                $patches{"$ddir-$dver-$arch"} .= "," if ((defined $patches{"$ddir-$dver-$arch"}) and ($p =~ /\.$ddir-$dver-$arch$/));
+                $patches{"$ddir-$dver-$arch"} .= "file://$p" if ($p =~ /\.$ddir-$dver-$arch$/);
+            }
+
+            # Prepare also remote patches to be included - Applied after the local ones
+            foreach my $p ("all","$pb{'dtype'}","$dfam","$ddir","$ddir-$dver","$ddir-$dver-$arch") {
+                my $f = "$ENV{'PBROOTDIR'}/$pbpkg/pbextpatch.$p";
+                next if (not -f $f);
+                if (not open(PATCH,$f)) {
+                    pb_display("Unable to open existing external patch file content $f\n");
+                    next;
+                }
+                while (<PATCH>) {
+                    chomp();
+                    $patches{"$ddir-$dver-$arch"} .= "," if (defined $patches{"$ddir-$dver-$arch"});
+                    $patches{"$ddir-$dver-$arch"} .= "$_";
+                }
+                close(PATCH);
+            }
+            pb_log(2,"DEBUG: pb->patches: ".Dumper($pb{'patches'})."\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'} = "$ddir-$dver-$arch";
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),\%pb);
+                    pb_filter_file("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver-$arch/".basename($f),\%pb);
                 }
             }
@@ -608 +637 @@
         pb_log(0,"Build files generated for ".join(',',sort(@found))."\n");
         pb_log(0,"No Build files found for ".join(',',sort(@notfound))."\n") if (@notfound);
+        pb_log(2,"DEBUG: patches: ".Dumper(%patches)."\n");
+
         # Get the generic filter (all.pbf) and 
         # apply those to the non-build files including those
@@ -624 +655 @@
         pb_log(2,"Files ".$liste."have been filtered\n");
 
-        # Filter potential patches
-        pb_mkdir_p("$dest/pbconf/pbpatch");
-        foreach my $p (sort(@patches)) {
-            my $pp = basename($p);
-            pb_filter_file($p,$ptr,"$dest/pbconf/pbpatch/$pp",\%pb);
-            pb_system("gzip -9 $dest/pbconf/pbpatch/$pp");
-        }
+        # 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);
+                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");
+            }
+            pb_log(0,"$patches{$v} ");
+        }
+        pb_log(0,"\n");
 
         # Prepare the dest directory for archive
@@ -685 +722 @@
     @pkgs = @$ptr;
 
+    my $arch = pb_get_arch();
+
     my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
@@ -712 +751 @@
             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+            my @specfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/","$ENV{'PBBUILDDIR'}/SPECS","spec");
 
             # We need to handle potential patches to upstream sources
-            my @patchfiles = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES");
+            pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/pbpatch/","$ENV{'PBBUILDDIR'}/SOURCES","patch");
 
             pb_log(2,"specfile: ".Dumper(\@specfile)."\n");
@@ -742 +781 @@
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
             pb_rm_rf("debian");
-            symlink "pbconf/$ddir-$dver","debian" || die "Unable to symlink to pbconf/$ddir-$dver";
+            symlink "pbconf/$ddir-$dver-$arch","debian" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
             chmod 0755,"debian/rules";
             if ($dver !~ /[0-9]/) {
@@ -763 +802 @@
 
             # We need to first extract the ebuild file 
-            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$tmpd");
+            @ebuildfile = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$ddir-$dver-$arch/","$tmpd","ebuild");
 
             # Prepare the build env for gentoo
@@ -811 +850 @@
             pb_system("tar xfz $src2","Extracting pbconf");
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
-            symlink "pbconf/$ddir-$dver","install" || die "Unable to symlink to pbconf/$ddir-$dver";
+            symlink "pbconf/$ddir-$dver-$arch","install" || die "Unable to symlink to pbconf/$ddir-$dver-$arch";
             if (-x "install/pbslack") {
                 pb_system("./install/pbslack","Building package");
@@ -1188 +1227 @@
     $v =~ s/,.*//;
 
-    # Which is our local arch ? (standardize on i386 for those platforms)
-    my $arch = `uname -m`;
-    chomp($arch);
-    $arch =~ s/i.86/i386/;
+    my $arch = pb_get_arch();
 
     # Launch the VMs/VEs
@@ -2043 +2079 @@
 my $dir=shift;
 my $ddir=shift;
+my $mandatory=shift || "spec";
 my @files;
 
+my $flag = "mayfail" if ($mandatory eq "patch");
+my $res;
+
 if ($src =~ /tar\.gz$/) {
-    pb_system("tar xfpz $src $dir","Extracting build files");
+    $res = pb_system("tar xfpz $src $dir","Extracting $mandatory files from $src",$flag);
 } elsif ($src =~ /tar\.bz2$/) {
-    pb_system("tar xfpj $src $dir","Extracting build files");
+    $res = pb_system("tar xfpj $src $dir","Extracting $mandatory files from $src",$flag);
 } else {
     die "Unknown compression algorithm for $src";
 }
+# If not mandatory return now
+return() if (($res != 0) and ($mandatory eq "patch"));
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {
     next if ($f =~ /^\./);
+    # Skip potential patch dir
+    next if ($f =~ /^pbpatch/);
     move("$dir/$f","$ddir") || die "Unable to move $dir/$f to $ddir";
     pb_log(2,"mv $dir/$f $ddir\n");
@@ -2100 +2144 @@
 }
 
+# Which is our local arch ? (standardize on i386 for those platforms)
+sub pb_get_arch {
+
+my $arch = `uname -m`;
+chomp($arch);
+$arch =~ s/i.86/i386/;
+return($arch);
+}
+
 1;

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -16 +16 @@
 use English;
 use File::Basename;
+use File::Copy;
 use POSIX qw(strftime);
 use lib qw (lib);
@@ -109 +110 @@
 This function exports a CMS content to a directory.
 The first parameter is the URL of the CMS content.
-The second parameter is the directory in which it is locally exposed (result of a checkout).
+The second parameter is the directory in which it is locally exposed (result of a checkout). If undef, then use the original CMS content.
 The third parameter is the directory where we want to deliver it (result of export).
 
@@ -127 +128 @@
 
 if ($scheme =~ /^svn/) {
-    if (-d $source) {
-        $tmp = $destdir;
-    } else {
-        $tmp = "$destdir/".basename($source);
-    }
-    pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+    if (defined $source) {
+        if (-d $source) {
+            $tmp = $destdir;
+        } else {
+            $tmp = "$destdir/".basename($source);
+        }
+        pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
+    } else {
+        pb_system("svn export $uri $destdir","Exporting $uri from SVN to $destdir");
+    }
 } elsif ($scheme eq "dir") {
     pb_system("cp -a $path $destdir","Copying $uri from DIR to $destdir");
@@ -152 +157 @@
     pb_mkdir_p($destdir);
 
-    # Check whether the file is well formed 
-    # (containing already a directory with the project-version name)
-    my ($pbwf) = pb_conf_get_if("pbwf");
-    if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
-        $destdir = dirname($destdir);
+    if (defined $source) {
+        # Check whether the file is well formed 
+        # (containing already a directory with the project-version name)
+        my ($pbwf) = pb_conf_get_if("pbwf");
+        if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
+            $destdir = dirname($destdir);
+        }
     }
 
@@ -174 +181 @@
         # zip
         pb_system("cd $destdir ; unzip $path","Extracting $path in $destdir");
+    } else {
+        # simple file: copy it (patch e.g.)
+        copy($path,$destdir);
     }
 } elsif ($scheme =~ /^cvs/) {
@@ -179 +189 @@
     my $dir=dirname($destdir);
     my $base=basename($destdir);
-    # CVS also needs a modules name not a dir
-    #if (-d $source) {
+    if (defined $source) {
+        # CVS also needs a modules name not a dir
         $tmp1 = basename($source);
-        #} else {
-        #$tmp1 = dirname($source);
-        #$tmp1 = basename($tmp1);
-        #}
+    } else {
+        # Probably not right, should be checked, but that way I'll notice it :-)
+        $tmp1 = $uri;
+    }
     my $optcvs = "";
 
@@ -304 +314 @@
 } elsif ($scheme =~ /^cvs/) {
     pb_system("cvs co $url $destination","Checking out $url to $destination ");
+} elsif ($scheme =~ /^file/) {
+    pb_cms_export($url,undef,$destination);
 } else {
     die "cms $scheme unknown";
@@ -417 +429 @@
 }
 
-=item B<pb_cms_isdiff>
+=item B<pb_cms_getpkg>
 
 This function returns the list of packages we are working on in a CMS action.

devel/pb/lib/ProjectBuilder/Env.pm

@@ -477 +477 @@
 #
 # PBREPO is replaced by the root URL to access the repository
-filter PBREPO = \$pbrepo
+filter PBREPO = \$pb->{'repo'}
 
 # PBSRC is replaced by the source package location after the repo
 #filter PBSRC = src/%{name}-%{version}.tar.gz
 
-# PBVER is replaced by the version (\$pbver in code)
-filter PBVER = \$pbver
-
-# PBDATE is replaced by the date (\$pbdate in code)
-filter PBDATE = \$pbdate
+# PBVER is replaced by the version (\$pb->{'ver'} in code)
+filter PBVER = \$pb->{'ver'}
+
+# PBDATE is replaced by the date (\$pb->{'date'} in code)
+filter PBDATE = \$pb->{'date'}
 
 # PBLOG is replaced by the changelog if value is yes
 #filter PBLOG = yes
 
-# PBTAG is replaced by the tag (\$pbtag in code)
-filter PBTAG = \$pbtag
-
-# PBREV is replaced by the revision (\$pbrev in code)
-filter PBREV = \$pbrev
-
-# PBPKG is replaced by the package name (\$pbpkg in code)
-filter PBPKG = \$pbpkg
-
-# PBPACKAGER is replaced by the packager name (\$pbpackager in code)
-filter PBPACKAGER = \$pbpackager
+# PBPATCHSRC is replaced by the patches names if value is yes
+#filter PBPATCHSRC = yes
+
+# PBPATCHCMD is replaced by the patches commands if value is yes
+#filter PBPATCHCMD = yes
+
+# PBTAG is replaced by the tag (\$pb->{'tag'} in code)
+filter PBTAG = \$pb->{'tag'}
+
+# PBREV is replaced by the revision (\$pb->{'rev'} in code)
+filter PBREV = \$pb->{'rev'}
+
+# PBPKG is replaced by the package name (\$pb->{'pkg'} in code)
+filter PBPKG = \$pb->{'pkg'}
+
+# PBPACKAGER is replaced by the packager name (\$pb->{'packager'} in code)
+filter PBPACKAGER = \$pb->{'packager'}
 
 # PBDESC contains the description of the package
@@ -527 +533 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package suffix (\$pbsuf in code)
-filter PBSUF = \$pbsuf
+# PBSUF is replaced by the package suffix (\$pb->{'suf'} in code)
+filter PBSUF = \$pb->{'suf'}
 
 # PBOBS is replaced by the Obsolete line
@@ -554 +560 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package suffix (\$pbsuf in code)
+# PBSUF is replaced by the package suffix (\$pbsuf'} in code)
 filter PBSUF = %{dist}
 
@@ -844 +850 @@
 Url:            PBURL
 Source:         PBREPO/PBSRC
+#PBPATCHSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 #Requires:       PBDEP
@@ -855 +862 @@
 %prep
 %setup -q
+#PBPATCHCMD
 
 %build

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -139 +139 @@
 my $destfile=shift;
 my $pb=shift;
-my %pb = %$pb;
 
 pb_log(2,"DEBUG: From $f to $destfile\n");
@@ -149 +148 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
+        pb_log(3,"DEBUG filter{$s}: $filter{$s}\n");
         # Expand variables if any single one found
-        pb_log(2,"DEBUG tmp: $tmp\n");
         if ($tmp =~ /\$/) {
+            # Order is important as we need to handle hashes refs before simple vars
+            eval { $tmp =~ s/(\$\w+-\>\{\'\w+\'\})/$1/eeg };
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
             eval { $tmp =~ s/(\$\/)/$1/eeg };
         # special case for ChangeLog only for pb
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
-            my $p = $pb{'defpkgdir'}->{$pbpkg};
-            $p = $pb{'extpkgdir'}->{$pbpkg} if (not defined $p);
-            pb_changelog($pb{'dtype'}, $pb{'pkg'}, $pb{'ver'}, $pb{'tag'}, $pb{'suf'}, $p, \*DEST, $tmp, $pb{'chglog'});
+            pb_log(3,"DEBUG filtering PBLOG\n");
+            my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}};
+            $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p);
+            pb_changelog($pb->{'dtype'}, $pb->{'pkg'}, $pb->{'ver'}, $pb->{'tag'}, $pb->{'suf'}, $p, \*DEST, $tmp, $pb->{'chglog'});
             $tmp = "";
         } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) {
+            pb_log(3,"DEBUG filtering PBPATCHSRC\n");
             my $i = 0;
-            foreach my $p (sort @$pb{'patches'}) {
-                print DEST "Patch$i: $p\n";
+            foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+                print DEST "Patch$i:         ".basename($p).".gz\n";
+                $i++;
             }
             $tmp = "";
         } elsif (($s =~ /^PBPATCHCMD$/) && ($line =~ /^PBPATCHCMD$/)) {
+            pb_log(3,"DEBUG filtering PBPATCHCMD\n");
             my $i = 0;
-            foreach my $p (sort @$pb{'patches'}) {
-                print DEST "%patch$i\n";
+            foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) {
+                print DEST "%patch$i -p1\n";
+                $i++;
             }
             print DEST "\n";
@@ -204 +209 @@
 my $destfile=shift;
 my $pb=shift;
-my %pb = %$pb;
 
 my $cp = "$ENV{'PBTMP'}/".basename($destfile);
-copy($destfile,$cp) || die "Unable to create $cp";
+copy($destfile,$cp) || die "Unable to copy $destfile to $cp";
 
 pb_filter_file($cp,$ptr,$destfile,$pb);