Seems like two separate issues which should go into two patches to me. Or at least the commit message should be made a little more generic. The code changes look good to me though. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/232