]> git.ipfire.org Git - pakfire.git/commitdiff
Fix inheriting when appending to variables.
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Aug 2011 17:51:29 +0000 (19:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 30 Aug 2011 17:51:29 +0000 (19:51 +0200)
pakfire/packages/lexer.py

index 54572c470cdc8cf3faedd3147982238a63bc81d0..bb32300cb00d432c0e944f6048468b533a3aaa53 100644 (file)
@@ -310,8 +310,10 @@ class Lexer(object):
 
                if o == "+":
                        prev = self.definitions.get(k, None)
+                       if prev is None and self.parent:
+                               prev = self.parent.definitions.get(k, None)
                        if prev:
-                               v = " ".join((prev, v))
+                               v = " ".join((prev or "", v))
 
                # Handle backslash.
                while v and v.endswith("\\"):