summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2010-03-05 04:13:02 +0100
committerRené 'Necoro' Neumann <necoro@necoro.net>2010-03-05 04:13:02 +0100
commit24d3a93837fdd544c5067d22ee3de05f1b080a3f (patch)
tree329c6812989c401769e7f53de4689eb63fe9f7d8 /portato
parent4741f013d2a028fce7cbf0e186707845ab47364c (diff)
parent9d98e004f14f06c536b4ef5055e798c11965efbc (diff)
downloadportato-24d3a93837fdd544c5067d22ee3de05f1b080a3f.tar.gz
portato-24d3a93837fdd544c5067d22ee3de05f1b080a3f.tar.bz2
portato-24d3a93837fdd544c5067d22ee3de05f1b080a3f.zip
Merge commit '9d98e004f14f06c536b4ef5055e798c11965efbc' into atom
Diffstat (limited to 'portato')
-rw-r--r--portato/backend/portage/system.py7
-rw-r--r--portato/backend/portage/system_22.py8
2 files changed, 6 insertions, 9 deletions
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index b2a48bb..4a08616 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -68,7 +68,12 @@ class PortageSystem (SystemInterface):
return PortagePackage(cpv)
def get_config_path (self):
- return portage.USER_CONFIG_PATH
+ path = portage.USER_CONFIG_PATH
+
+ if path[0] != "/":
+ return os.path.join(self.settings.settings["ROOT"], path)
+ else:
+ return path
def get_merge_command (self):
return ["/usr/bin/python", "/usr/bin/emerge"]
diff --git a/portato/backend/portage/system_22.py b/portato/backend/portage/system_22.py
index f69e15c..d720a06 100644
--- a/portato/backend/portage/system_22.py
+++ b/portato/backend/portage/system_22.py
@@ -63,11 +63,3 @@ class PortageSystem_22 (PortageSystem):
def new_package (self, cpv):
return PortagePackage_22(cpv)
-
- def get_config_path (self):
- path = PortageSystem.get_config_path(self)
-
- if path[0] != "/":
- return os.path.join(self.settings.settings["ROOT"], path)
- else:
- return path