[SCM] morituri/master: move checksum import inline so we don't import gst again
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:19 UTC 2014
The following commit has been merged in the master branch:
commit 5a778deca7772c067b806a8aa70045b6f20aa339
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Fri Apr 16 21:11:50 2010 +0000
move checksum import inline so we don't import gst again
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 05d9146..2b621e5 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -25,10 +25,8 @@ import os
import shutil
import tempfile
-from morituri.common import common, task, checksum
-
-from morituri.common import log
-log.init()
+from morituri.common import common, task
+print 'here we are'
class Profile(object):
name = None
@@ -460,6 +458,8 @@ class SafeRetagTask(task.MultiSeparateTask):
self.tasks = [TagReadTask(path), ]
def stopped(self, taskk):
+ from morituri.common import checksum
+
if not taskk.exception:
# Check if the tags are different or not
if taskk == self.tasks[0]:
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list