From 3cf8b0a2dccb3e9294c2dbf4f24f0dfb02540c72 Mon Sep 17 00:00:00 2001
From: lxnay <lxnay@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Thu, 17 Jul 2008 10:48:09 +0000
Subject: [PATCH] Entropy/Equo: - avoid raising an exception if
 text_configuration cannot be imported due to missing /usr/bin/diff

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2272 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 client/equo.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/equo.py b/client/equo.py
index 50257c3d3..8ccccd109 100644
--- a/client/equo.py
+++ b/client/equo.py
@@ -340,8 +340,11 @@ def reset_cache():
         pass
 
 def load_conf_cache():
+    try:
+        import text_configuration
+    except exceptionTools.FileNotFound:
+        return
     if not etpUi['quiet']: print_info(red(" @@ ")+blue(_("Caching equo conf")), back = True)
-    import text_configuration
     try:
         oldquiet = etpUi['quiet']
         etpUi['quiet'] = True
@@ -574,6 +577,9 @@ except exceptionTools.FtpError, e:
 except exceptionTools.PermissionDenied, e:
     print_error(darkred(" * ")+red(str(e)+". %s." % (_("Cannot continue"),) ))
     sys.exit(1)
+except exceptionTools.FileNotFound, e:
+    print_error(darkred(" * ")+red(str(e)+". %s." % (_("Cannot continue"),) ))
+    sys.exit(1)
 except dbapi2Exceptions['OperationalError'], e:
     if str(e).find("disk I/O error") == -1:
         raise