Changed a call from munkicommon.readPlist to FoundationPlist.readPlist.

git-svn-id: http://munki.googlecode.com/svn/trunk@178 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-08-24 17:25:24 +00:00
parent 3c84b536f9
commit f64408f132
+3 -3
View File
@@ -23,12 +23,13 @@ import optparse
import datetime
import dateutil.parser
import subprocess
import plistlib
#import plistlib
from munkilib import munkicommon
from munkilib import updatecheck
from munkilib import installer
from munkilib import munkistatus
from munkilib import FoundationPlist
def getIdleSeconds():
# stolen from Karl Kuehn -- thanks, Karl!
@@ -41,7 +42,7 @@ def getIdleSeconds():
def clearLastNotifiedDate():
pl = munkicommon.readPlist("/Library/Preferences/ManagedInstalls.plist")
pl = FoundationPlist.readPlist("/Library/Preferences/ManagedInstalls.plist")
if pl:
if 'LastNotifiedDate' in pl:
cmd = ['/usr/bin/defaults', 'delete', '/Library/Preferences/ManagedInstalls',
@@ -100,7 +101,6 @@ def main():
help='Used by launchd LaunchAgent when running at the loginwindow.')
p.add_option('--manualcheck', action='store_true',
help='Used by launchd LaunchAgent when checking manually.')
p.add_option('--munkistatusoutput', '-m', action='store_true',
help='Uses MunkiStatus.app for progress feedback when installing.')
p.add_option('--id', default='',