mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-08 05:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor message and comment update

Browse Source 
Comment regarding limitations to installing Apple updates removed from
managedsoftwareupdate.  Warning message regarding missing
'installs/receipts' on import of an '--apple-update' item is not
displayed.
This commit is contained in:
Heig Gregorian
2013-02-16 13:20:25 -08:00
parent cd3c69b5a2
commit b55c1c30af
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/managedsoftwareupdate
+1 -3
View File
@@ -231,9 +231,7 @@ def doInstallTasks(do_apple_updates, only_unattended=False):
raise
if do_apple_updates:
# (note we do not currently support doing Apple updates
# as unattended_installs. Support may be added in the future)
# are we supposed to handle Apple Software Updates?
# install Apple updates
try:
need_to_restart = appleupdates.installAppleUpdates(
only_unattended=only_unattended)
code/client/munkiimport
+6 -5
View File
@@ -784,11 +784,12 @@ def main():
pkginfo['catalogs'] = [item.strip()
for item in newvalue.split(',')]
if 'receipts' not in pkginfo and 'installs' not in pkginfo:
print >> sys.stderr, ('WARNING: There are no receipts and no '
'\'installs\' items for this installer '
'item. You will need to add at least one '
'item to the \'installs\' list.')
if not APPLEMETADATA:
if 'receipts' not in pkginfo and 'installs' not in pkginfo:
print >> sys.stderr, ('WARNING: There are no receipts and no '
'\'installs\' items for this installer '
'item. You will need to add at least '
'one item to the \'installs\' list.')
#TO-DO: provide a way to add 'installs' items right here
print