Skip to content

Commit

Permalink
Merge pull request #61 from eyemyth/master
Browse files Browse the repository at this point in the history
Fixed check for system profiler key in report dict
  • Loading branch information
grahamgilbert committed Mar 3, 2015
2 parents f87d080 + 68703a9 commit 76deb89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/sal-postflight
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ try:

if report['Puppet']['version']['config'] == None:
report['Puppet']['version']['config'] = 'None'

if debug:
print 'DEBUG: Puppet Report'
print report['Puppet']
except:
pass

# Merge the system profiler report into the Munki report
if not report['MachineInfo']:
if not 'MachineInfo' in report:
report['MachineInfo'] = {}
report['MachineInfo']['SystemProfile'] = system_profile
if debug:
Expand Down

0 comments on commit 76deb89

Please sign in to comment.