summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2009-01-26 00:14:13 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2009-01-26 00:14:13 +0100
commit3badeaf275cf8447e2d3575490fca81ff0bd290d (patch)
treedc4a048b827aa6e1725a9f84a1e0d9ee85070ca6 /portato
parentc20d0bc4acc7166ae167f4eae723bc24c30c9e1f (diff)
downloadportato-3badeaf275cf8447e2d3575490fca81ff0bd290d.tar.gz
portato-3badeaf275cf8447e2d3575490fca81ff0bd290d.tar.bz2
portato-3badeaf275cf8447e2d3575490fca81ff0bd290d.zip
Removing 'catapult' option for system
Diffstat (limited to '')
-rw-r--r--portato/backend/__init__.py4
-rw-r--r--portato/backend/portage/__init__.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/portato/backend/__init__.py b/portato/backend/__init__.py
index 1f62d6b..4a4144a 100644
--- a/portato/backend/__init__.py
+++ b/portato/backend/__init__.py
@@ -56,10 +56,6 @@ def load_system ():
debug("Setting Portage System")
from .portage import PortageSystem
_sys = PortageSystem ()
- elif SYSTEM == "catapult":
- debug("Setting Catapult System")
- from .catapult import CatapultSystem
- _sys = CatapultSystem()
else:
raise InvalidSystemError, SYSTEM
diff --git a/portato/backend/portage/__init__.py b/portato/backend/portage/__init__.py
index 02a4a82..67eebfa 100644
--- a/portato/backend/portage/__init__.py
+++ b/portato/backend/portage/__init__.py
@@ -12,13 +12,16 @@
from __future__ import absolute_import
+from ...helper import debug
from portage import VERSION as PV
VERSION = tuple(map(int, (x.split("_")[0] for x in PV.split("."))))
if VERSION >= (2, 2):
+ debug("Using portage-2.2")
from .system_22 import PortageSystem_22 as PortageSystem
from .package_22 import PortagePackage_22 as PortagePackage
else:
+ debug("Using portage-2.1")
from .system import PortageSystem
from .package import PortagePackage