[devscripts] 02/05: file-excluded support escaped separators: newline, tab, space

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 69329b529522b2e84ea2c2e20d7e6e4d72e13c75
Author: CSILLAG Tamas <cstamas at cstamas.hu>
Date:   Thu Dec 26 18:04:51 2013 +0100

    file-excluded support escaped separators: newline, tab, space
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 scripts/uscan.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 51cb756..7314a5c 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1541,7 +1541,11 @@ EOF
 	    my $file_list;
 	    spawn(exec => ['find', $main_source_dir], wait_child => 1, to_string => \$file_list);
 	    my $nfiles_before = split /\n/, $file_list;
-	    foreach (grep { $_ } split /\s+/, $data->{"files-excluded"}) {
+	    # see the thread for details http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635920#127
+	    my @excluded = ($data->{"files-excluded"} =~ /(?:\A|\G\s+)((?:\\.|[^\\\s])+)/g);
+	    # un-escape
+	    @excluded = map { s/\\(.)/$1/g; $_ } @excluded;
+	    foreach (@excluded) {
 		# delete trailing '/' because otherwise find -path will fail
 		s?/+$??;
 		# use rm -rf to enable deleting non-empty directories

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git