rev 12839 - in branches/kde4.2/packages/pkg-kde-tools/trunk: debian symbolshelper/Debian/PkgKde/SymHelper

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-05 00:54:35 +0000 (Fri, 05 Dec 2008)
New Revision: 12839

Modified:
   branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
   branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
Log:
Improve `pkgkde-symbolshelper patch` processing of patches which patch
multiple files. Use the first patch partion that applies properly.

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2008-12-05 00:51:59 UTC (rev 12838)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog	2008-12-05 00:54:35 UTC (rev 12839)
@@ -1,3 +1,10 @@
+pkg-kde-tools (0.3.1~pre1) UNRELEASED; urgency=low
+
+  * Improve `pkgkde-symbolshelper patch` processing of patches which patch
+    multiple files. Use the first patch partion that applies properly.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Fri, 05 Dec 2008 02:46:09 +0200
+
 pkg-kde-tools (0.3) experimental; urgency=low
 
   * Add pkgkde-symbolshelper. It aims to make handling of symbols in

Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm	2008-12-05 00:51:59 UTC (rev 12838)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm	2008-12-05 00:54:35 UTC (rev 12839)
@@ -343,7 +343,9 @@
     # Adopt the patch to our needs (filename)
     my $file2patch;
     my $is_patch;
-    while(<$patchfh>) {
+    my $sameline = 0;
+    while($sameline || ($_ = <$patchfh>)) {
+        $sameline = 0;
         if (defined $is_patch) {
             if (m/^(?:[+ -]|@@ )/) {
                 # Patch continues
@@ -351,7 +353,17 @@
                 $is_patch++;
             } else {
                 # Patch ended
-                last;
+                if (!close(PATCH)) {
+                    # Continue searching for another patch
+                    $sameline = 1;
+                    $file2patch = undef;
+                    $is_patch = undef;
+                    next;
+                } else {
+                    $file2patch = undef;
+                    # $is_patch stays set
+                    last;
+                }
             }
         } elsif (defined $file2patch) {
             if (m/^[+]{3}\s+\S+/) {
@@ -367,8 +379,7 @@
             $file2patch = $1;
         }
     }
-
-    if($file2patch && close(PATCH) && $is_patch) {
+    if(($file2patch && close(PATCH)) || $is_patch) {
         # Patching was successful. Reparse
         my $insymfile = new Debian::PkgKde::SymHelper::SymbFile($infile);
         my $newsymfile = new Debian::PkgKde::SymHelper::SymbFile($archfn);
@@ -381,6 +392,7 @@
 
         # Now process new symbols. We need to a create template from them
         if (my $dummysymfile = $newsymfile->get_new_symbols_as_symbfile($archsymfile)) {
+            $dummysymfile->dump(*STDOUT);
             $self->add_symbol_file($dummysymfile, $arch);
             $self->preprocess();