From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Apr 2011 11:23:08 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire into server
X-Git-Tag: 0.9.3~47^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffba93f0945c9682e31e604a03bb89abc5a3c5e6;p=pakfire.git

Merge branch 'master' of git://git.ipfire.org/oddments/pakfire into server

Conflicts:
	pakfire/packages/base.py
---

ffba93f0945c9682e31e604a03bb89abc5a3c5e6
diff --cc pakfire/packages/base.py
index baea8ed97,777bc9989..a1df3e6ee
--- a/pakfire/packages/base.py
+++ b/pakfire/packages/base.py
@@@ -282,9 -288,23 +288,26 @@@ class Package(object)
  		return self.metadata.get("PKG_UUID", None)
  
  	@property
 +	def supported_arches(self):
 +		return self.metadata.get("PKG_SUPPORTED_ARCHES", "all")
 +
+ 	def requires(self):
+ 		ret = ""
+ 
+ 		# The default attributes, that are process for the requires.
+ 		attrs = ("PKG_REQUIRES", "PKG_DEPS")
+ 
+ 		# Source packages do depend on their build dependencies.
+ 		if self.arch == "src":
+ 			attrs = ("PKG_BUILD_DEPS",)
+ 
+ 		for i in attrs:
+ 			ret = self.metadata.get(i, ret)
+ 			if ret:
+ 				break
+ 
+ 		return set(ret.split())
+ 
  	@property
  	def _provides(self):
  		# Make package identifyable by its name and version/release tuples.