fixes to portage_config state
Merge pull request #5552 from hulu/bare-excepts

fixes to portage_config state