[Bash-completion-commits] [debian] 12/19: debian/extra/debhelper/dh_bash-completion: fix installation process when more than one "proper snippet" is being installed, thanks to Jean-Michel Vourgère (Closes: #680852)

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit 3d87ab898d2e89dba7a788cc326f116b17330f8c
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 19 11:18:02 2014 +0100

    debian/extra/debhelper/dh_bash-completion: fix installation process when more than one "proper snippet" is being installed, thanks to Jean-Michel Vourgère (Closes: #680852)
---
 debian/changelog                          | 5 ++++-
 debian/extra/debhelper/dh_bash-completion | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27b11a7..4b322cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,11 @@ bash-completion (1:2.1-3) UNRELEASED; urgency=medium
       options in dpkg-deb, thanks to Uwe Storbeck (Closes: #698977)
     - dpkg_fix_-W_option.patch: -W|--show doesn't support udebs/ddebs,
       thanks to Luca Capello (Closes: #697513)
+  * debian/extra/debhelper/dh_bash-completion: fix installation process
+    when more than one "proper snippet" is being installed, thanks to
+    Jean-Michel Vourgère (Closes: #680852)
 
- -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:12:55 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:16:47 +0100
 
 bash-completion (1:2.1-2) unstable; urgency=low
 
diff --git a/debian/extra/debhelper/dh_bash-completion b/debian/extra/debhelper/dh_bash-completion
index 3cd6e5d..2ab9abb 100755
--- a/debian/extra/debhelper/dh_bash-completion
+++ b/debian/extra/debhelper/dh_bash-completion
@@ -38,7 +38,7 @@ init();
 my $srcdir = '.';
 $srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR};
 
-foreach my $package (@{$dh{DOPACKAGES}}) {
+PKG: foreach my $package (@{$dh{DOPACKAGES}}) {
 	next if is_udeb($package);
 
 	my $tmp = tmpdir($package);
@@ -80,7 +80,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 					warning "file-list parsing failed, installing as proper snippet";
 
 					doit("install", "-p", "-m644", $completions, "$bc_dir/$package");
-					exit 0
+					next PKG
 				}
 				push @filelist, @found;
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git