mirror of
https://github.com/anope/anope.git
synced 2026-06-28 00:36:37 +02:00
Merge branch '2.0' into 2.1.
This commit is contained in:
+6
-1
@@ -942,5 +942,10 @@ void Conf::LoadConf(File &file)
|
||||
if (!itemname.empty() || !wordbuffer.empty())
|
||||
throw ConfigException("Unexpected garbage at end of file: " + file.GetName());
|
||||
if (!block_stack.empty())
|
||||
throw ConfigException("Unterminated block at end of file: " + file.GetName() + ". Block was opened on line " + stringify(block_stack.top()->linenum));
|
||||
{
|
||||
if (block_stack.top())
|
||||
throw ConfigException("Unterminated block at end of file: " + file.GetName() + ". Block was opened on line " + stringify(block_stack.top()->linenum));
|
||||
else
|
||||
throw ConfigException("Unterminated commented block at end of file: " + file.GetName());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user