From d2c16c2f83698766fd39b66ee49e8c43e6fe614a Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Mon, 20 Mar 2006 00:12:22 +0000 Subject: Move CacheError from the block of python imports to the block of portage imports, fix spelling in error message. svn path=/main/trunk/; revision=2960 --- pym/portage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 6a84c925a..586fe46d8 100644 --- 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 -- cgit v1.2.3-1-g7c22