diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-03-26 19:54:15 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-03-26 19:54:15 +0000 |
| commit | 33ab8e39c5f1cc5e3388b760389f4453e3a193b7 (patch) | |
| tree | 75c73458f1dc5e78734f858d9fd5c02a1e3c75a9 /lib/sbin/ConfigurationParser.pl | |
| parent | 91f2d7285a268d823f48e66ca4755815cf4f968f (diff) | |
Some tidying and a bugfix.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3605 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/ConfigurationParser.pl')
| -rw-r--r-- | lib/sbin/ConfigurationParser.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sbin/ConfigurationParser.pl b/lib/sbin/ConfigurationParser.pl index 8e5f3920..40aac418 100644 --- a/lib/sbin/ConfigurationParser.pl +++ b/lib/sbin/ConfigurationParser.pl @@ -46,6 +46,8 @@ sub CreateConfigurationDatabase if ($cfg{"\U$thorn\E REQUIRES"}); } + $cfg->{"\U$thorn\E USES THORNS"} = ''; + # verify that all required thorns are there in the ThornList if ($cfg{"\U$thorn\E REQUIRES THORNS"}) { @@ -95,9 +97,9 @@ sub CreateConfigurationDatabase { if ( "\U$cap\E" eq "\U$requiredcap\E" ) { - @foundlist[$foundcap] = $cap; + $foundlist[$foundcap] = $cap; $foundthorn = $thorncap; - $foundcap = $foundcap + 1; + $foundcap++; } } } @@ -117,7 +119,7 @@ sub CreateConfigurationDatabase &CST_error (0, "More than one thorn provides the capability $requiredcap. " . "These thorns are: $founderrlist. \nPlease use only one.\n" ); } - $cfg{"\U$thorn\E USES THORNS"} .= $foundthorn, " "; + $cfg{"\U$thorn\E USES THORNS"} .= $foundthorn . " "; } } } @@ -157,7 +159,6 @@ sub ParseConfigurationCCL $cfg->{"\U$thorn REQUIRES THORNS\E"} = ''; $cfg->{"\U$thorn OPTIONAL\E"} = ''; $cfg->{"\U$thorn OPTIONS\E"} = ''; - $cfg->{"\U$thorn\E USES THORNS"} = ''; # Read the data @data = &read_file($filename); |