slapos: add support for cliff 1.7.0.

91852bd7 · Cédric de Saint Martin · 80fc4dad · 91852bd7
Commit 91852bd7 authored Sep 12, 2014 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

slapos/cli/entry.py slapos/cli/entry.py +5 -1

No files found.
--- a/slapos/cli/entry.py
+++ b/slapos/cli/entry.py
@@ -41,7 +41,11 @@ os.environ.setdefault('EDITOR', 'vi')

 import cliff
 import cliff.app
-from cliff.app import LOG
+try:
+  LOG = cliff.app.App.LOG
+except AttributeError:
+  # Support for older (< 1.7.0) cliff versions
+  from cliff.app import LOG
 import cliff.commandmanager

 import slapos.version