Fix bug 522602 more properly

Instead of adding src_unpack(), move vcs-snapshot to else block, thereby
ensuring src_unpack() from inherit mercurial is used.