Don\'t farm file deletion out to subprocess
Clean up flow control in prepare_srpm

Do the things needed on conditions rather than setting flags and doing them
later. Makes things (just a little) clearer.