While testing the fix from PR #231 (commit bc6378b here) I found some other problems, so here's a new version with some followup fixes. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/234