Fix mismatch of output basename for file and dir

1. one doc, -o /tmp/foo => /tmp/foo.doc 2. two docs, -o /tmp/ => /tmp/foo/doc1.doc, /tmp/foo/doc2.doc
unoconv · Jul 1, 2015 · 45fc428 · sese · Jul 3, 2015 · dagwieers
1 parent bd0f756
commit 45fc428
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/unoconv b/unoconv
@@ -959,11 +959,11 @@ class Convertor:
             if not op.stdout:
                 (outputfn, ext) = os.path.splitext(inputfn)
                 if not op.output:
-                    outputfn = outputfn + os.extsep + outputfmt.extension
+                    outputfn = realpath(outputfn + os.extsep + outputfmt.extension)
                 elif len(op.filenames) > 1:
-                    outputfn = op.output + os.extsep + outputfmt.extension
-                else:
                     outputfn = realpath(op.output, os.path.basename(outputfn) + os.extsep + outputfmt.extension)
+                else:
+                    outputfn = realpath(outputfn + os.extsep + outputfmt.extension)
 
                 outputurl = unohelper.absolutize( self.cwd, unohelper.systemPathToFileUrl(outputfn) )
                 info(1, "Output file: %s" % outputfn)