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

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

diff --cc pakfire/base.py
index 264bab22ef72ef29fa619a5cd99a2671fa518a0f,6f8f24d7234bda0a8d9d2bf74e2b8ae1aa2d64c3..18b07473ae357ae1d5c35c4415e56ce090fc5f66
--- 1/pakfire/base.py
--- 2/pakfire/base.py
+++ b/pakfire/base.py
@@@ -18,16 -17,9 +18,17 @@@ from constants import 
  from i18n import _
  
  class Pakfire(object):
-       def __init__(self, builder=False, configs=[], enable_repos=None,
-                       disable_repos=None, distro_config=None):
 +      RELATIONS = (
 +              (">=", satsolver.REL_GE,),
 +              ("<=", satsolver.REL_LE,),
 +              ("=" , satsolver.REL_EQ,),
 +              ("<" , satsolver.REL_LT,),
 +              (">" , satsolver.REL_GT,),
 +      )
 +
+       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()
  

diff --cc pakfire/cli.py
Simple merge