Changeset bdc38391e869150773124fd0afe1027671146cc6

Timestamp:

07/29/11 11:29:49 (10 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

721e76160f9384fb67bb7844b1ecefe4d9b8cfd1

Parents:

b353777e30837cddb30ae89a91209cabb59218be

git-committer:

Luper Rouch <luper.rouch@…> (07/29/11 11:29:49)

Message:

checking return code of mkvmerge

File:

• utils/avi2mkv/src/avi2mkv/__init__.py (modified) (4 diffs)

utils/avi2mkv/src/avi2mkv/__init__.py

@@ -5 +5 @@
 import multiprocessing
 import tempfile
+import sys
 from avi2mkv import subrip
 
@@ -13 +14 @@
 
     *args* must be a pair containing *(input_files, options)*. *options* must
-    be an object containing the command line arguments parsed by argparse.
+    be an object containing the command line arguments parsed by
+    :mod:`argparse`.
     """
     input_file, options = args
@@ -22 +24 @@
         subtitles_file = root + ".srt"
         if not options.quiet:
-            print "Found subtitles file '%s'" % subtitles_file
+            sys.stdout.write("Found subtitles file '%s'\n" % subtitles_file)
     else:
         subtitles_file = None
@@ -63 +65 @@
     kwargs = {}
     if not options.quiet:
-        print "Muxing '%s' to '%s'..." % (input_file, output_file)
+        sys.stdout.write("Muxing '%s' to '%s'...\n" % 
+                (input_file, output_file))
     else:
         fnull = open(os.devnull, "w")
         kwargs["stdout"] = fnull
         kwargs["stderr"] = fnull
-    subprocess.call(args, **kwargs)
+    try:
+        subprocess.check_call(args, **kwargs)
+    except subprocess.CalledProcessError, err:
+        sys.stderr.write("Error muxing '%s', mkvmerge exited with error "
+                "code %s" % (input_file, err.returncode))