From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Dec 2011 11:15:15 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~33^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8a67f9a0491af3395d7160cdb0270c7dcc1bfde;p=pakfire.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	python/pakfire/packages/make.py
---

e8a67f9a0491af3395d7160cdb0270c7dcc1bfde
diff --cc python/pakfire/packages/make.py
index 41c6aadaf,61fafbbdd..7a1086697
--- a/python/pakfire/packages/make.py
+++ b/python/pakfire/packages/make.py
@@@ -270,13 -270,9 +270,12 @@@ class Makefile(MakefileBase)
  
  	@property
  	def requires(self):
 -		reqs = self.lexer.build.get_var("requires", "").splitlines()
 +		reqs = []
 +
 +		for line in self.lexer.build.get_var("requires", "").splitlines():
 +			reqs += [r.strip() for r in line.split(",")]
  
- 		# Remove all empty items.
- 		return [r for r in reqs if r]
+ 		return self.filter_deps(reqs)
  
  	@property
  	def provides(self):