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 · 81b0ae5 · 81b0ae5
1 parent bd0f756
commit 81b0ae5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/unoconv b/unoconv
@@ -961,9 +961,9 @@ class Convertor:
                 if not op.output:
                     outputfn = 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)