aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2010-03-24 15:21:58 +0000
committerfuzzyray <fuzzyray@gentoo.org>2010-03-24 15:21:58 +0000
commitdb09a0e43e2e1cf98f0d789f651a1816a46dcba7 (patch)
tree190142ffd40988d90ab8f5789500be5290e91088 /pym/gentoolkit/equery/__init__.py
parentUpdate to genscripts rev 382. This has more fixes for py3k and the modular re... (diff)
downloadgentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.tar.gz
gentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.tar.bz2
gentoolkit-db09a0e43e2e1cf98f0d789f651a1816a46dcba7.zip
Merge genscripts rev 406
svn path=/trunk/gentoolkit/; revision=756
Diffstat (limited to 'pym/gentoolkit/equery/__init__.py')
-rw-r--r--pym/gentoolkit/equery/__init__.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/pym/gentoolkit/equery/__init__.py b/pym/gentoolkit/equery/__init__.py
index d511082..60ec161 100644
--- a/pym/gentoolkit/equery/__init__.py
+++ b/pym/gentoolkit/equery/__init__.py
@@ -8,9 +8,6 @@
from __future__ import print_function
-# Move to Imports section after Python 2.6 is stable
-
-
__all__ = (
'format_options',
'format_package_names',
@@ -25,12 +22,12 @@ __version__ = "svn"
# =======
import errno
+import os
import sys
import time
from getopt import getopt, GetoptError
import portage
-from portage import os
import gentoolkit
from gentoolkit import CONFIG
@@ -347,7 +344,7 @@ def main():
)
loaded_module.main(module_args)
except portage.exception.AmbiguousPackageName as err:
- raise errors.GentoolkitAmbiguousPackage(err)
+ raise errors.GentoolkitAmbiguousPackage(err.args[0])
except IOError as err:
if err.errno != errno.EPIPE:
raise