Merge commit '9f374461559460527e47237323e511123f31b6b0' into feature/envvars

2015-12-17 07:27:26 -08:00
parent 5d111a3c04 9f37446155
commit 4ca243e490
1 changed files with 7 additions and 1 deletions
@@ -358,14 +358,20 @@ def repair_pdf(
    try:
        out = check_output(args_qpdf, stderr=STDOUT, universal_newlines=True)
    except CalledProcessError as e:
+        exit_with_error = True
        if e.returncode == 2:
            print("{0}: not a valid PDF, and could not repair it.".format(
                    options.input_file))
            print("Details:")
            print(e.output)
+        elif e.returncode == 3 and e.output.find("operation succeeded"):
+            exit_with_error = False
+            out = e.output
+            print(e.output)
        else:
            print(e.output)
-        sys.exit(ExitCode.input_file)
+        if exit_with_error:
+            sys.exit(ExitCode.input_file)

    log.debug(out)