From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Aug 2011 17:51:29 +0000 (+0200)
Subject: Fix inheriting when appending to variables.
X-Git-Tag: 0.9.9~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=399f35198031498b2146c2b9a55ad71b91b8c420;p=pakfire.git

Fix inheriting when appending to variables.
---

diff --git a/pakfire/packages/lexer.py b/pakfire/packages/lexer.py
index 54572c470..bb32300cb 100644
--- a/pakfire/packages/lexer.py
+++ b/pakfire/packages/lexer.py
@@ -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("\\"):