summaryrefslogtreecommitdiff
path: root/portato/backend/portage/settings_22.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2010-09-06 17:47:26 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2010-09-06 17:47:26 +0200
commit4ac3a9d99ffe2a7763f2f109903866ed56f52842 (patch)
tree74680ea1bec1792c53813c98601dd674fa09faee /portato/backend/portage/settings_22.py
parentefccd35b43ab610e762d353bc917d3afb17c9a61 (diff)
parentb8078063684b5683126cf9bd5b09808666b91af8 (diff)
downloadportato-4ac3a9d99ffe2a7763f2f109903866ed56f52842.tar.gz
portato-4ac3a9d99ffe2a7763f2f109903866ed56f52842.tar.bz2
portato-4ac3a9d99ffe2a7763f2f109903866ed56f52842.zip
Merged 0.14.1
Diffstat (limited to 'portato/backend/portage/settings_22.py')
-rw-r--r--portato/backend/portage/settings_22.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/portato/backend/portage/settings_22.py b/portato/backend/portage/settings_22.py
index 253ecaa..33ac60d 100644
--- a/portato/backend/portage/settings_22.py
+++ b/portato/backend/portage/settings_22.py
@@ -12,7 +12,11 @@
-import portage.sets
+try:
+ import portage.sets as psets
+except ImportError:
+ import portage._sets as psets
+
from .settings import PortageSettings
class PortageSettings_22 (PortageSettings):
@@ -24,4 +28,4 @@ class PortageSettings_22 (PortageSettings):
def load (self):
PortageSettings.load(self)
- self.setsconfig = portage.sets.load_default_config(self.settings, self.trees[self.settings["ROOT"]])
+ self.setsconfig = psets.load_default_config(self.settings, self.trees[self.settings["ROOT"]])