From 814aba6eceae21fa956cbc00fab99365c98de20d Mon Sep 17 00:00:00 2001 From: Ole Bergmann Date: Sun, 5 Feb 2017 02:43:28 +0100 Subject: [PATCH] Updated to work with newest version of whipper --- whatlogger/logger/what.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/whatlogger/logger/what.py b/whatlogger/logger/what.py index 7a19769..ddefab2 100755 --- a/whatlogger/logger/what.py +++ b/whatlogger/logger/what.py @@ -2,7 +2,6 @@ import hashlib from morituri.common import common -from morituri.configure import configure from morituri.result import result version = "0.2.2" @@ -50,8 +49,12 @@ def logRip(self, ripResult, epoch): # global - # version string; FIXME - lines.append("morituri version %s" % configure.version) + try: + from morituri.configure import configure + lines.append("morituri version %s" % configure.version) + except ImportError: + import morituri + lines.append("whipper version %s" % morituri.__version__) lines.append("") lines.append("morituri-whatlogger version %s" % version)