Merge commit '9d98e004f14f06c536b4ef5055e798c11965efbc' into atom

3 files changed, 10 insertions, 9 deletions

diff --git a/doc/NEWS b/doc/NEWS
index 71a529e..a5d3186 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -4,6 +4,10 @@ next:
 - use an internal messagequeue module instead of external shm
 - show the list of world packages
 
+0.13.1:
+- fix segfault in GLib
+- correct config path handling for portage-2.1.7.x
+
 0.13:
 - allow lines w/o keyword in package.keywords
 - added support for ktsuss as su-frontend
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