-s is --switch and --short; get ride of it for --switch and use -w
Prevent opam-mk-repo for deleting tmp/ and log/ subdirs if these directories already exist.

This is quite a bad bug and should fix #403