[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.7.0.1-4-gb0f8366

Modestas Vainius modax at alioth.debian.org
Sun Apr 18 20:50:11 UTC 2010


The following commit has been merged in the master branch:
commit b0f8366a1c331f1ca550052159a2c679d40562ae
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Apr 18 23:24:28 2010 +0300

    Fix a bug in confirmed arches handling.
    
    Previous code didn't kill dupes as it should have.
---
 pkgkde-symbolshelper |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pkgkde-symbolshelper b/pkgkde-symbolshelper
index f3f6581..14b8d32 100755
--- a/pkgkde-symbolshelper
+++ b/pkgkde-symbolshelper
@@ -365,8 +365,9 @@ sub patch_symfile {
     error("no valid patched symbol files found") unless keys %psymfiles;
 
     # Fork $orig symbol file for the rest (unpatched) confirmed arches.
+    my %confirmed_arches; $confirmed_arches{$_} = 1 foreach @confirmed_arches;
     my @carches = kill_dupes(
-	grep { $_ ne @confirmed_arches }  grep { ! exists $psymfiles{$_} }
+	grep { ! exists $psymfiles{$_} && ! exists $confirmed_arches{$_} }
 	    $symfile->get_confirmed_arches()
     );
     @confirmed_arches = kill_dupes(

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list