Fix overly nested directories

The first four lines fix a regression introduced by
18af4d6325050c24106d8f9ebd8baad124b36af6.  The rest
removes an unnecessary conditional and unindents the
block.
Merge branch 'nested-fix'

Conflicts:
	stdeb/command/sdist_dsc.py