summaryrefslogtreecommitdiff
path: root/portato/backend/catapult
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-03-11 23:25:17 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-03-11 23:25:17 +0100
commit14efe88ba5ef199bbe0e57873898fcd75286a3ec (patch)
tree4c4988e2c44169afbfb83516b68966c6026babfd /portato/backend/catapult
parent232950edbb62ebdd7e1289612d56db6950cbfdd2 (diff)
downloadportato-14efe88ba5ef199bbe0e57873898fcd75286a3ec.tar.gz
portato-14efe88ba5ef199bbe0e57873898fcd75286a3ec.tar.bz2
portato-14efe88ba5ef199bbe0e57873898fcd75286a3ec.zip
use catapult vars
Diffstat (limited to '')
-rw-r--r--portato/backend/catapult/package.py5
-rw-r--r--portato/backend/catapult/system.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/portato/backend/catapult/package.py b/portato/backend/catapult/package.py
index e42ac6a..5da4361 100644
--- a/portato/backend/catapult/package.py
+++ b/portato/backend/catapult/package.py
@@ -19,6 +19,7 @@ from ..exceptions import BlockedException, PackageNotFoundException
from ...helper import debug, unique_array
import dbus
+import catapult
import os.path
from gettext import lgettext as _
@@ -26,8 +27,8 @@ from gettext import lgettext as _
class CatapultPackage(Package):
bus = dbus.SessionBus()
- dbus_object = bus.get_object("org.gentoo.catapult.portage", "/org/gentoo/catapult/Package", follow_name_owner_changes = True)
- proxy = dbus.Interface(dbus_object, "org.gentoo.catapult.Package")
+ dbus_object = bus.get_object(catapult.get_dbus_address(catapult.DEFAULT), catapult.CATAPULT_PACKAGE_BUS, follow_name_owner_changes = True)
+ proxy = dbus.Interface(dbus_object, catapult.CATAPULT_PACKAGE_IFACE)
def _new_flags (self):
flags = self.get_new_use_flags()
diff --git a/portato/backend/catapult/system.py b/portato/backend/catapult/system.py
index eecf122..c04f997 100644
--- a/portato/backend/catapult/system.py
+++ b/portato/backend/catapult/system.py
@@ -16,6 +16,7 @@ import re, os
from gettext import lgettext as _
from threading import Event
import dbus
+import catapult
from .package import CatapultPackage
from ..system_interface import SystemInterface
@@ -28,8 +29,8 @@ class CatapultSystem (SystemInterface):
self.bus = dbus.SessionBus()
# get the system
- so = self.bus.get_object("org.gentoo.catapult.portage", "/org/gentoo/catapult/System", follow_name_owner_changes = True)
- self.proxy = dbus.Interface(so, "org.gentoo.catapult.System")
+ so = self.bus.get_object(catapult.get_dbus_address(catapult.DEFAULT), catapult.CATAPULT_SYSTEM_BUS, follow_name_owner_changes = True)
+ self.proxy = dbus.Interface(so, catapult.CATAPULT_SYSTEM_IFACE)
def geneticize_list (self, list_of_packages, only_cpv = False):
"""Convertes a list of cpv's into L{backend.Package}s.