[yum-cvs] plugins/aliases

[James Antill]

 plugins/aliases/aliases.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 75779b7aa5785ff716804bfe62c31c766004b807
Author: James Antill <james at and.org>
Date:   Fri Dec 21 15:49:00 2007 -0500

    Quick work around for yumex

diff --git a/plugins/aliases/aliases.py b/plugins/aliases/aliases.py
index 6f7a061..3c3fe81 100644
--- a/plugins/aliases/aliases.py
+++ b/plugins/aliases/aliases.py
@@ -16,10 +16,14 @@
 #
 # by James Antill
 
-from yum.plugins import PluginYumExit, TYPE_INTERACTIVE
+from yum.plugins import TYPE_INTERACTIVE
 import sys
 import time
-import cli
+try: # yumex doesn't like import cli, but runs this
+    from cli import CliError
+except:
+    class CliError: # Never used by yumex
+        pass
 from i18n import _
 
 requires_api_version = '2.1'
@@ -88,7 +92,7 @@ class AliasCommand(AliasedCommand):
             except:
                 base.logger.critical(_("Can't open aliases file: %s") %
                                      conffile)
-                raise cli.CliError
+                raise CliError
                 
     def doCommand(self, base, basecmd, extcmds):
         if len(extcmds) > 1: # Add a new alias