- do_mv: minor cosmetic changes

osc/commandline.py

@@ -7628,18 +7628,18 @@ def do_mv(self, subcmd, opts, source, dest):
         """
 
         if not os.path.isfile(source):
-            raise oscerr.WrongArgs("Source file ``%s'' does not exists" % source)
+            raise oscerr.WrongArgs("Source file '%s' does not exists or is no file" % source)
         if not opts.force and os.path.isfile(dest):
-            raise oscerr.WrongArgs("Dest file ``%s'' already exists" % dest)
+            raise oscerr.WrongArgs("Dest file '%s' already exists" % dest)
+        if os.path.isdir(dest):
+            dest = os.path.join(dest, os.path.basename(source))
         src_pkg = findpacs([source])
         tgt_pkg = findpacs([dest])
         if not src_pkg:
             raise oscerr.NoWorkingCopy("Error: \"%s\" is not located in an osc working copy." % os.path.abspath(source))
         if not tgt_pkg:
             raise oscerr.NoWorkingCopy("Error: \"%s\" does not point to an osc working copy." % os.path.abspath(dest))
 
-        if os.path.isfile(source) and os.path.isdir(dest):
-            dest = os.path.join(dest, os.path.basename(source))
         os.rename(source, dest)
         try:
             tgt_pkg[0].addfile(os.path.basename(dest))