From 5576624cf899dc37bef2aa739b867ecfa665bdf1 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sat, 5 Sep 2009 13:13:46 +0000
Subject: [PATCH] Merge some

[SVN r56047]
---
 v2/build/project.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/v2/build/project.py b/v2/build/project.py
index e0af3c36c..86a804ee5 100644
--- a/v2/build/project.py
+++ b/v2/build/project.py
@@ -1,5 +1,5 @@
 # Status: being ported by Vladimir Prus
-# Base revision: 40480
+# Base revision: 41324
 
 # Copyright 2002, 2003 Dave Abrahams 
 # Copyright 2002, 2005, 2006 Rene Rivera 
@@ -1008,4 +1008,7 @@ attribute is allowed only for top-level 'project' invocations""")
         """
 
         c = string.join(condition, ",")
-        return [c + ":" + r for r in requirements]
+        if c.find(":") != -1:
+            return [c + r for r in requirements]
+        else:
+            return [c + ":" + r for r in requirements]