From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sun, 16 May 2010 12:04:47 +0000 (+0100)
Subject: Handle whitespace better in import script
X-Git-Tag: openafs-devel-1_7_1~1673
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f9498799de1fe3e22c695c54284e6d072f8daecc

Handle whitespace better in import script

Make the import script handle multiple, rather than just single,
whitespace separators between source and destination files.

Change-Id: I0cc0fdd6ba1ef4bd5407b2e0fd9285ffe902408b
Reviewed-on: http://gerrit.openafs.org/2572
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/external/import-external-git.pl b/src/external/import-external-git.pl
index e03abc4..5a279d3 100755
--- a/src/external/import-external-git.pl
+++ b/src/external/import-external-git.pl
@@ -49,7 +49,7 @@ my $fh = IO::File->new("$externalDir/$module-files")
   or die "Couldn't open mapping file : $!\n";
 while (<$fh>) {
   next if /^\s#/;
-  if (/^(.+)\s+(.+)$/) {
+  if (/^(\S+)\s+(\S+)$/) {
     $mapping{$1} = $2;
   } elsif (/\w+/) {
     die "Unrecognised line in mapping file : $_\n";