summaryrefslogtreecommitdiff
path: root/portato/backend/portage/package.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-06-25 21:50:36 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-06-25 21:50:36 +0200
commitb11914a429a63f5d33bdb6fc0d543be3fff031d3 (patch)
treef070e879d47db5f00cce4bf55f5da5cb2e7f2ab4 /portato/backend/portage/package.py
parent01f01abb51af0639bd0e1fccd4ad5fccd5ca074c (diff)
parent9f820103c30e89376a0484c614d2bbc068998e48 (diff)
downloadportato-b11914a429a63f5d33bdb6fc0d543be3fff031d3.tar.gz
portato-b11914a429a63f5d33bdb6fc0d543be3fff031d3.tar.bz2
portato-b11914a429a63f5d33bdb6fc0d543be3fff031d3.zip
First merge from portage-2.2 branch as it includes fixes for trunk too
Diffstat (limited to 'portato/backend/portage/package.py')
-rw-r--r--portato/backend/portage/package.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index db9866a..78125ee 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -18,7 +18,12 @@ from .. import system
from ..exceptions import BlockedException, PackageNotFoundException, DependencyCalcError
from ...helper import debug, error, unique_array
-import portage, portage_dep
+import portage
+
+try:
+ import portage.dep as portage_dep
+except ImportError:
+ import portage_dep
import os.path