X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=aa9160e11b8e62ab03c16a0e961dc579bbe0894f;hb=7bcd4fef81679dedcabc5a58b12511a6b52c4fe4;hp=6cbc9328a43ba7a4556d28e7a55e43762256c969;hpb=f76c063eb9b792088e034ffb4c2f173b843e8c57;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 6cbc932..aa9160e 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -38,9 +38,7 @@ Package::Loader::Loader(Package &p):
 
 void Package::Loader::if_arch(const string &cond)
 {
-	const Architecture &arch = obj.builder.get_current_arch();
-	bool negate = (cond[0]=='!');
-	bool match = (arch.match_name(cond.substr(negate))!=negate);
+	bool match = obj.builder.get_current_arch().match_name(cond);
 	obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
 	if(match)
 		load_sub_with(*this);
@@ -51,4 +49,6 @@ void Package::Loader::require(const string &n)
 	Package *req = obj.builder.get_package_manager().find_package(n);
 	if(req)
 		obj.requires.push_back(req);
+	else
+		obj.problems.push_back(format("Required package %s not found", n));
 }