X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcondition.cpp;h=13861ba5aea01a8ad0466c44b3991094ad50f94d;hb=740d7cdd71fc2f068e44bfc6c8cc7e9565de16f6;hp=136b852fccd30c6e2b6ed2f7701ca8004e771c50;hpb=699493ee7346c578537f4e310702c57012686c22;p=builder.git

diff --git a/source/condition.cpp b/source/condition.cpp
index 136b852..13861ba 100644
--- a/source/condition.cpp
+++ b/source/condition.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/strings/utils.h>
 #include "builder.h"
 #include "condition.h"
@@ -27,7 +20,7 @@ Condition::Condition(SourcePackage &p, const string &expr):
 		if(token==string::npos)
 			expression.insert(StringMap::value_type(*i, "="));
 		else if(token==0 && (*i)[0]=='!')
-			expression.insert(StringMap::value_type(*i, "!"));
+			expression.insert(StringMap::value_type(i->substr(1), "!"));
 		else
 			expression.insert(StringMap::value_type(i->substr(0, token), i->substr(token)));
 	}
@@ -66,7 +59,7 @@ bool Condition::eval()
 
 
 Condition::Loader::Loader(Condition &c):
-	cond(c)
+	DataFile::ObjectLoader<Condition>(c)
 {
 	add("require",    &Loader::require);
 	add("build_info", &Loader::build_info);
@@ -74,10 +67,10 @@ Condition::Loader::Loader(Condition &c):
 
 void Condition::Loader::require(const string &pkg)
 {
-	cond.requires.push_back(pkg);
+	obj.requires.push_back(pkg);
 }
 
 void Condition::Loader::build_info()
 {
-	load_sub(cond.build_info);
+	load_sub(obj.build_info);
 }