From 3badeaf275cf8447e2d3575490fca81ff0bd290d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Mon, 26 Jan 2009 00:14:13 +0100
Subject: Removing 'catapult' option for system

---
 portato/backend/__init__.py         | 4 ----
 portato/backend/portage/__init__.py | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'portato')

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
-- 
cgit v1.2.3