summaryrefslogtreecommitdiff
path: root/lib/sbin/ConfigurationParser.pl
diff options
context:
space:
mode:
authorschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-06-08 21:14:24 +0000
committerschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-06-08 21:14:24 +0000
commit95c28069ce7dd1502c2114e76031930d5bef9dd4 (patch)
tree3776b3824ee7cea2eb9730f77776601199406abb /lib/sbin/ConfigurationParser.pl
parentbe7faad85c89756196ee7f4292ec2ec3ff9b00a3 (diff)
Comment out the warning that is printed when the "requires thorns"
mechanism is used. The warning is now factually incorrect, as capabilities are not a one-to-one replacement for the "requires thorns" mechanism. Furthermore, the standard thorns should not elicit warnings. This warning should be re-enabled once a better mechanism is available, e.g. the planned private inheritance for beta 16. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3763 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin/ConfigurationParser.pl')
-rw-r--r--lib/sbin/ConfigurationParser.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sbin/ConfigurationParser.pl b/lib/sbin/ConfigurationParser.pl
index 37d3d9a3..24be9eec 100644
--- a/lib/sbin/ConfigurationParser.pl
+++ b/lib/sbin/ConfigurationParser.pl
@@ -171,11 +171,11 @@ sub ParseConfigurationCCL
elsif($line =~ m/^\s*REQUIRES\s+THORNS\s*:\s*(.*)/i)
{
$cfg->{"\U$thorn\E REQUIRES THORNS"} .= "$1";
- if ($cfg->{"\U$thorn\E REQUIRES THORNS"})
- {
- &CST_error (3, '\'Requires Thorns\' will not be supported in release beta-14' .
- "\n Please adjust thorn \U$thorn\E to use \'Requires\' instead.");
- }
+# if ($cfg->{"\U$thorn\E REQUIRES THORNS"})
+# {
+# &CST_error (3, '\'Requires Thorns\' will not be supported in release beta-14' .
+# "\n Please adjust thorn \U$thorn\E to use \'Requires\' instead.");
+# }
}
elsif($line =~ m/^\s*REQUIRES\s*(.*)/i)
{