[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/unsermake
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-10-05 6:06:51
Message-ID: 20041005060651.5FE46126EF () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

conditions keep to be a problem whenever I touch them in create mode ;(
(this fixes endless recursion in kdebase compilation)


  M +9 -2      amfile.py   1.20


--- kdenonbeta/unsermake/amfile.py  #1.19:1.20
@@ -175,7 +175,14 @@
                 adds = []
 
-                if var in self.overwrites or var in subst_vars:
+                if var in self.overwrites or subst_vars.has_key(var):
                         # already defined
                         return
+                if self.conds.has_key(var):
+                        list1 = self.replace_srcdir(self.conds[var][1])
+                        list2 = self.replace_srcdir(self.conds[var][2])
+
+                        self.conds[var] = (self.conds[var][0], list1, list2)
+                        self.overwrites.append(var)
+                        return
                 orig = self.definition(var)
                 rec = self.definition_rec(var)
@@ -640,5 +647,5 @@
                                                 list1 = self.replace_srcdir(self.conds[var][1])
                                                 list2 = self.replace_srcdir(self.conds[var][2])
-                                        
+
                                                 self.conds[var] = (self.conds[var][0], list1, list2)
                                                 l = '$(%s)%s' % (var, match.group(3))


[prev in list] [next in list] [prev in thread] [next in thread]