From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Jul 2011 09:16:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire into sat
X-Git-Tag: 0.9.3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6853dbc439cc19e5c3fee6de6e4e0bf699e8142f;p=pakfire.git

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

Conflicts:
	pakfire/base.py
	pakfire/repository/index.py
---

6853dbc439cc19e5c3fee6de6e4e0bf699e8142f
diff --cc pakfire/base.py
index 264bab22e,6f8f24d72..18b07473a
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@@ -18,16 -17,9 +18,17 @@@ from constants import 
  from i18n import _
  
  class Pakfire(object):
 +	RELATIONS = (
 +		(">=", satsolver.REL_GE,),
 +		("<=", satsolver.REL_LE,),
 +		("=" , satsolver.REL_EQ,),
 +		("<" , satsolver.REL_LT,),
 +		(">" , satsolver.REL_GT,),
 +	)
 +
- 	def __init__(self, builder=False, configs=[], enable_repos=None,
- 			disable_repos=None, distro_config=None):
+ 	def __init__(self, path="/", builder=False, configs=[],
+ 			enable_repos=None, disable_repos=None,
+ 			distro_config=None):
  		# Check if we are operating as the root user.
  		self.check_root_user()