[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.4-5-ga7b4aaa

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5de1c8ff33d5e7ed0a06f468e1f21294d0c6b725
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Feb 17 13:30:49 2010 +0200

    Smarter implementation of the last change.
---
 debian/changelog                   |    4 ++--
 symbolshelper/pkgkde-symbolshelper |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ca2277..332e3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 pkg-kde-tools (0.6.5~pre1) UNRELEASED; urgency=low
 
   * pkgkde-debs2symbols: remove 0 size patch files.
-  * `pkgkde-symbolshelper batchpatch`: do not fail if no patches found for the
-    package.
+  * `pkgkde-symbolshelper batchpatch`: if no packages explicitly specified,
+    select only those for which patches exist.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 16 Feb 2010 11:51:57 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index a7bbaf4..eef08fe 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -588,6 +588,8 @@ sub subcommand_batchpatch {
 	@input_patches = @ARGV;
 	push @input_patches, "-" unless @input_patches;
 	my @patches = load_patches(@input_patches);
+	my %packages = map({ $_->{package} => 1 }
+	    grep { defined $_->{package} } @patches);
 
 	my @packages;
 	if (@opt_packages) {
@@ -596,7 +598,7 @@ sub subcommand_batchpatch {
 		push @packages, @pkgs;
 	    }
 	} else {
-	    @packages = get_all_packages() unless @opt_packages;
+	    @packages = grep { exists $packages{$_} } get_all_packages();
 	}
 
 	error("no packages specified and none found in debian/control")
@@ -608,9 +610,7 @@ sub subcommand_batchpatch {
 	    regular_print("-" x length($msg));
 	    regular_print($msg);
 	    regular_print("-" x length($msg));
-	    if (! grep { defined $_->{package} && $_->{package} eq $package } @patches) {
-		regular_print("* UNABLE to find patches for %s", $package);
-	    } elsif (my $infile = find_package_symbolfile_path($package, $opt_arch)) {
+	    if (my $infile = find_package_symbolfile_path($package, $opt_arch)) {
 		my $template;
 		eval {
 		    $template = patch_symfile($package, $opt_version, $infile, undef, @patches);

-- 
Debian Qt/KDE packaging tools