aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-11 18:04:12 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-11 18:04:12 +0100
commit58790fa740d84ec36f2cd14073b2d7ffa472a706 (patch)
treeef662c537cd9e235d3458993475be4ff1eace5a0
parent7e41c09ced6ed85cf83e2973b85b821255e8da66 (diff)
downloadpaludis-58790fa740d84ec36f2cd14073b2d7ffa472a706.tar.gz
paludis-58790fa740d84ec36f2cd14073b2d7ffa472a706.tar.xz
Just warn for , labels too
-rw-r--r--paludis/repositories/e/dep_parser.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 0ab3b47..6d06a3b 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -685,6 +685,14 @@ paludis::erepository::parse_dependency_label(const std::string & s, const EAPI &
for (std::set<std::string>::iterator it = labels.begin(), it_e = labels.end(); it != it_e; ++it)
{
+ if (std::string::npos != it->find(','))
+ {
+ Log::get_instance()->message("e.dep_parser.obsolete_label_syntax", ll_warning, lc_no_context)
+ << "Label '" << *it << "' uses commas, which are obsolete, so treating it as a build label instead";
+ l->add_label(make_shared_ptr(new DependenciesBuildLabel(*it, return_literal_function(true))));
+ continue;
+ }
+
std::string c(e.supported()->dependency_labels()->class_for_label(*it));
if (c.empty())
throw EDepParseError(s, "Unknown label '" + *it + "'");