summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorgoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-06-21 19:27:21 +0000
committergoodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-06-21 19:27:21 +0000
commit799fe4930d30f8e8747a58f5678ec7279e8a0868 (patch)
treec2b3c0713979e5bdc2185ec5854507ba80ef5686 /lib
parentb00a7e3dc5d23ed530548d748c18f61bf8708fc5 (diff)
Adding thorn name to error message. (Patch from Yaakoub.)
Fixes PR 1723. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3782 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rw-r--r--lib/sbin/CSTUtils.pl4
-rw-r--r--lib/sbin/interface_parser.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sbin/CSTUtils.pl b/lib/sbin/CSTUtils.pl
index 9759af73..d34b9b95 100644
--- a/lib/sbin/CSTUtils.pl
+++ b/lib/sbin/CSTUtils.pl
@@ -262,7 +262,7 @@ sub TestName
#@@*/
sub SplitWithStrings
{
- my ($expression) = @_;
+ my ($expression, $thorn) = @_;
my $insstring = 0;
my $indstring = 0;
@@ -338,7 +338,7 @@ sub SplitWithStrings
if($insstring || $indstring)
{
- print "Error: Unterminated string\n"
+ print "Error: Unterminated string while parsing interface for thorn : $thorn\n"
}
if($escaping)
diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl
index b372925c..abdeba61 100644
--- a/lib/sbin/interface_parser.pl
+++ b/lib/sbin/interface_parser.pl
@@ -844,7 +844,7 @@ sub parse_interface_ccl
}
# split(/\s*=\s*|\s+/, $options_list);
- %options = SplitWithStrings($options_list);
+ %options = SplitWithStrings($options_list,$thorn);
# Parse the options
foreach $option (sort keys %options)