summaryrefslogtreecommitdiff
path: root/lib/sbin/MakeUtils.pl
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-06-14 15:48:19 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-06-14 15:48:19 +0000
commit6eb5c04361105b270659a393024898fa11bca45c (patch)
tree0e765e389792176e728790b39558e2d72c3f29ac /lib/sbin/MakeUtils.pl
parent504c7ee8c1d0aadcd77b636d2378b9e16d59b7dd (diff)
Fixed regex to build the inherits/friend/shares lists for a thorn.
It basically now allows both white spaces and commas as separators. This closes PR Cactus/720. git-svn-id: http://svn.cactuscode.org/flesh/trunk@2231 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/MakeUtils.pl')
-rw-r--r--lib/sbin/MakeUtils.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sbin/MakeUtils.pl b/lib/sbin/MakeUtils.pl
index 7b12496f..d81f3c92 100644
--- a/lib/sbin/MakeUtils.pl
+++ b/lib/sbin/MakeUtils.pl
@@ -175,7 +175,7 @@ sub ThornInfo
{
$inherits =~ s:^\s*::;
$inherits =~ s:\s*$::;
- $inherits =~ s:,:\s:g;
+ $inherits =~ s:,: :g;
$inherits =~ s:[\s\t\n]+:,:g;
}
@@ -188,6 +188,7 @@ sub ThornInfo
{
$friends =~ s:^\s*::;
$friends =~ s:\s*$::;
+ $friends =~ s:,: :g;
$friends =~ s:[\s\t\n]+:,:g;
}
if($shares =~ /^[\s\t\n]*$/)
@@ -198,6 +199,7 @@ sub ThornInfo
{
$shares =~ s:^\s*::;
$shares =~ s:\s*$::;
+ $shares =~ s:,: :g;
$shares =~ s:[\s\t\n]+:,:g;
}