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

Modestas Vainius modax at alioth.debian.org
Tue Feb 16 10:43:27 UTC 2010


The following commit has been merged in the master branch:
commit 57465dc5017b65aac3b8d1f1beeed1c76cf1ff8b
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Feb 16 12:04:10 2010 +0200

    `pkgkde-symbolshelper batchpatch`: do not fail if no patches found for the package.
---
 debian/changelog                   |    2 ++
 symbolshelper/pkgkde-symbolshelper |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f601ace..1ca2277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +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.
 
  -- 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 915f48e..a7bbaf4 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -608,7 +608,9 @@ sub subcommand_batchpatch {
 	    regular_print("-" x length($msg));
 	    regular_print($msg);
 	    regular_print("-" x length($msg));
-	    if (my $infile = find_package_symbolfile_path($package, $opt_arch)) {
+	    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)) {
 		my $template;
 		eval {
 		    $template = patch_symfile($package, $opt_version, $infile, undef, @patches);

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list