Move CacheError from the block of python imports to the block of portage imports...

svn path=/main/trunk/; revision=2960

diff --git a/pym/portage.py b/pym/portage.py
index 6a84c925a0ddf67b1b042949396548647415cd7c..586fe46d899a3ad16894c0a59662893c6d738f81 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -30,10 +30,9 @@ try:
        import commands
        from time import sleep
        from random import shuffle
-       from cache.cache_errors import CacheError
 except ImportError, e:
        sys.stderr.write("\n\n")
-       sys.stderr.write("!!! Failed to complete python imports. There are internal modules for\n")
+       sys.stderr.write("!!! Failed to complete python imports. These are internal modules for\n")
        sys.stderr.write("!!! python and failure here indicates that you have a problem with python\n")
        sys.stderr.write("!!! itself and thus portage is not able to continue processing.\n\n")
 
@@ -50,6 +49,7 @@ except ImportError:
        bsd_chflags = None
 
 try:
+       from cache.cache_errors import CacheError
        import cvstree
        import xpak
        import getbinpkg