diff options
author | Bryn M. Reeves <bmr@redhat.com> | 2013-04-22 09:28:06 -0700 |
---|---|---|
committer | Bryn M. Reeves <bmr@redhat.com> | 2013-04-22 09:28:06 -0700 |
commit | 438a4cb3e57e603199720d327e56a02799159662 (patch) | |
tree | 53eba73be368d62da93f47c10f1004164660704f | |
parent | d24a27a5e6205a3b63875b683a9463a6a8c8f420 (diff) | |
parent | b73f47bbf683a310bbe18543f5a058e3ae8af619 (diff) | |
download | sos-438a4cb3e57e603199720d327e56a02799159662.tar.gz |
Merge pull request #133 from jhjaggars/master
fix OSX policy loading
-rw-r--r-- | sos/policies/windows.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sos/policies/windows.py b/sos/policies/windows.py index 0424a3f0..f2ce48c4 100644 --- a/sos/policies/windows.py +++ b/sos/policies/windows.py @@ -27,10 +27,11 @@ class WindowsPolicy(Policy): is_windows = False try: from java.lang import System - is_windows = "win" in System.getProperty('os.name').lower() + os_name = System.getProperty('os.name').lower() except: - is_windows = "win" in platform.system().lower() - return is_windows + os_name = platform.system().lower() + + return "win" in os_name and "darwin" not in os_name def is_root(self): if "S-1-16-12288" in shell_out("whoami /groups"): |