saltstack/salt — pull request #3100 by thekuffs (2012-12-31 20:38:59+00:00)
Title: Fix ValueError on cross-platform minion / master

* Rework __virtual__ grains check logic
* Remove rpm import

This fixes #3097 and cleans up some of the branch logic in platform selection. It also implores those with a bit more knowledge about platform diversity to consider if we can drop down to a simple `os_family` and `pythonversion` check.