Fails to do anything

This merge fixes a couple of issues that have crept in recently that prevent fedora-upgrade from starting.