mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-27 01:19:12 -06:00
Code Issues Packages Projects Releases Wiki Activity
510 Commits 11 Branches 114 Tags
41ccc6c3efc94703f7fae157ff74cd84216833a2
Commit Graph

389 Commits

Author SHA1 Message Date
Justin McWilliams
41ccc6c3ef Reload preferences from ManagedInstalls.plist after preflight execution in case preflight changed any preferences. 
git-svn-id: http://munki.googlecode.com/svn/trunk@754 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 23:05:56 +00:00
Justin McWilliams
fc3ff13fb6 Moving 'AdditionalHttpHeaders' ManagedInstalls.plist string to munkicommon const for cleaner reuse in preflight/postflight. 
git-svn-id: http://munki.googlecode.com/svn/trunk@753 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 22:47:02 +00:00
Greg Neagle
9cd9708514 pylint cleanup: mark unused variable. 
git-svn-id: http://munki.googlecode.com/svn/trunk@752 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 17:38:34 +00:00
Greg Neagle
f88b74c116 pylint cleanup: mark unused variables, add docstring and fix indentation in removeItemFromSelfServeUninstallList() 
git-svn-id: http://munki.googlecode.com/svn/trunk@751 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 17:37:49 +00:00
Greg Neagle
b0619cf035 pylint cleanup: mark unused variables 
git-svn-id: http://munki.googlecode.com/svn/trunk@750 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 17:35:32 +00:00
Greg Neagle
eceedc0e86 pylint cleanups: mark unused variables. 
git-svn-id: http://munki.googlecode.com/svn/trunk@749 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 17:34:47 +00:00
Greg Neagle
231e309ae4 filesystemItemExists() now returns 0 if the item doesn't exist, 1 if it exists and the checksum matches (or there is no checksum provided), or -1 if the item exists but the checksum does not match. This should make someVersionInstalled() work better with pkginfo that relies on files in the installs key. 
processManifestForOptionalInstalls(), processManifestForManagedUpdates(), processManifestForInstalls(), and processManifestForRemovals(), which ll shared a very similar structure, have been refactored and replaced with processManifestForKey().

Various pylint cleanups: marking unused variables, global variable names are now all CAPS, added some docstrings, 

Removed all remaining references to aliases. (support for aliases was removed a long time ago, but some references still remained in the code)

Removed support for "modifies" dependency type, which was deprecated months ago.

git-svn-id: http://munki.googlecode.com/svn/trunk@748 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-13 17:03:39 +00:00
Greg Neagle
4491ae9b03 Initial support for managed_updates in manifests. Items listed in managed_updates will have updates downloaded and applied if any prior version is installed (subject to munki using pkginfo information to determine if an item is installed). 
git-svn-id: http://munki.googlecode.com/svn/trunk@747 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 19:23:13 +00:00
Justin McWilliams
51cb83d350 managedsoftwareupdate: Use single quotes for all non-doctstring and non-heredoc strings. 
git-svn-id: http://munki.googlecode.com/svn/trunk@746 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 03:44:55 +00:00
Justin McWilliams
b36b32672b munkicommon.py & updatecheck.py: Use single quotes for all non-doctstring strings. 
git-svn-id: http://munki.googlecode.com/svn/trunk@745 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 03:29:47 +00:00
Justin McWilliams
184d5368c2 Clean some lint on updatecheck: reorder imports, replace single-quote docstrings with double, etc 
git-svn-id: http://munki.googlecode.com/svn/trunk@744 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 02:01:15 +00:00
Justin McWilliams
eeb5bdcb9d Make some global consts for ManagedInstalls(.plist) paths. Replace single-quoted docstrings with double-quotes to standardize across codebase. 
git-svn-id: http://munki.googlecode.com/svn/trunk@743 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 01:05:37 +00:00
Justin McWilliams
5873a12d26 Allow for additional headers sent with curl() HTTP requests to be set in ManagedInstalls.plist 
git-svn-id: http://munki.googlecode.com/svn/trunk@740 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-10 00:15:45 +00:00
Justin McWilliams
1ca7fc80e8 Merge: Verify permissions of preflight and postflight scripts are secure before; skip execution of insecure skips but continue Munki run. 
git-svn-id: http://munki.googlecode.com/svn/trunk@738 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-09 21:42:27 +00:00
Greg Neagle
4f74f2806f Fixing dumb attempt to improve the quality of output from softwareupdate... 
git-svn-id: http://munki.googlecode.com/svn/trunk@736 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-09 17:09:34 +00:00
Greg Neagle
25f2a90ede Revert to using subprocess.Popen in unmountdmg() so extraneous output doesn't get sent to STDOUT. 
git-svn-id: http://munki.googlecode.com/svn/trunk@733 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-08 15:29:01 +00:00
Greg Neagle
6e308faf40 Misc cleanups 
git-svn-id: http://munki.googlecode.com/svn/trunk@732 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-07 23:18:47 +00:00
Justin McWilliams
1465884431 pylint cleanup and docstring updates for managedsoftwareupdate. 
git-svn-id: http://munki.googlecode.com/svn/trunk@729 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-07 19:28:27 +00:00
Greg Neagle
121ecb0484 munkicommon: pylint cleanup, better handling of items in the pkgutil database that don't have a version number (I didn't know this was possible!). 
appleupdates: pylint cleanup; provide installed_size data for Managed Software Update display

managedsoftwareupdate: move "Checking for available Apple Software Updates..." message to appleupdates.checkForSoftwareUpdates()

makepkginfo: fix installer_item_size determination when we add up the contents of a directory (was bytes, now Kbytes like everything else)

git-svn-id: http://munki.googlecode.com/svn/trunk@725 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-07 18:04:40 +00:00
Greg Neagle
a82374aaf3 Still more SUS description parsing tweaking... 
git-svn-id: http://munki.googlecode.com/svn/trunk@723 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-03 21:49:55 +00:00
Greg Neagle
a061031585 More tweaking to the parsing of Apple Software Update .dist files to extract descriptions. 
git-svn-id: http://munki.googlecode.com/svn/trunk@722 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-03 21:38:49 +00:00
Greg Neagle
b742e4fbb0 Changed she-bang to #!/usr/bin/python since we require Apple's included python, not just any python the user may have installed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@721 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-03 21:37:37 +00:00
Greg Neagle
7b4a610db3 Print warning if pkg given is a bundle-style package. 
git-svn-id: http://munki.googlecode.com/svn/trunk@717 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-03 02:17:50 +00:00
Greg Neagle
6b864f85f9 PackageVerificationMode now defaults to "hash". Current munki infrastructures with no package hashes will continue to work as before PackageVerificationMode was added; admins can add hashes to packages and they will be used. 
git-svn-id: http://munki.googlecode.com/svn/trunk@716 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-02 23:11:19 +00:00
Greg Neagle
c7ecf1a893 Display available Apple updates from command-line managedsoftwareupdate. 
Don't look specifically for English in Apple SU dist files.

git-svn-id: http://munki.googlecode.com/svn/trunk@715 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-02 21:17:11 +00:00
Justin McWilliams
8aa56bd9f9 Merging pkg-hash-verification branch to trunk, adding package SHA-256 hash verification. Deleting branch. 
git-svn-id: http://munki.googlecode.com/svn/trunk@714 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-02 17:50:54 +00:00
Greg Neagle
c7badf027b Changes to getAdobeCatalogInfo to filter out more language files/language packs from the installs array. 
git-svn-id: http://munki.googlecode.com/svn/trunk@711 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-02 16:54:54 +00:00
Justin McWilliams
957b0df766 Changing hash verification warnings a bit per Greg's request. 
git-svn-id: http://munki.googlecode.com/svn/branches/pkg-hash-verification@710 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-02 16:43:02 +00:00
Greg Neagle
929ae48a67 After a successful removal, remove the itemname from the SelfServeManifest's managed_uninstalls list if applicable. 
git-svn-id: http://munki.googlecode.com/svn/trunk@707 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-01 22:13:40 +00:00
Greg Neagle
ac43c0616a Comment typo fix. 
git-svn-id: http://munki.googlecode.com/svn/trunk@705 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-01 18:14:45 +00:00
Greg Neagle
fca4134640 Formatting changes 
git-svn-id: http://munki.googlecode.com/svn/trunk@704 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-01 18:13:51 +00:00
Greg Neagle
2d0ce0ecca Changes for optional installs 
git-svn-id: http://munki.googlecode.com/svn/trunk@702 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-01 16:57:51 +00:00
Greg Neagle
0b479630db When killing a stuck process, wrap the os.kill in a try/except block. 
git-svn-id: http://munki.googlecode.com/svn/trunk@701 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-09-01 16:50:50 +00:00
Justin McWilliams
bf8cb1b7eb Package SHA-256 Hash verification 
git-svn-id: http://munki.googlecode.com/svn/branches/pkg-hash-verification@699 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-31 15:15:47 +00:00
Greg Neagle
88df333959 Replaced code that removed already-removed-items from the SelfServeManifest's managed_uninstalls list with a Python list comphrension. 
git-svn-id: http://munki.googlecode.com/svn/trunk@697 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-27 18:08:56 +00:00
Greg Neagle
8fad18788c Remove item from SelfServeManifest's managed_uninstalls list if it is not currently installed; this fixes an issue where after using Munki to remove an optional install item, the same item is manually installed. Previously, munki would attempt to remove it again because it retained the item in the managed_uninstalls list in the SelfServeManifest. 
git-svn-id: http://munki.googlecode.com/svn/trunk@696 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-27 17:55:03 +00:00
Greg Neagle
f9d3675c42 New preference -- SuppressStopButtonOnInstall 
Hides the Stop button in the Managed Software Update status window during an install/removal session.

git-svn-id: http://munki.googlecode.com/svn/trunk@695 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-27 16:10:03 +00:00
Greg Neagle
86cbaee5da If the user clicks the Stop button during an update check, don't check for Apple Software Updates. 
git-svn-id: http://munki.googlecode.com/svn/trunk@694 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-27 15:11:02 +00:00
Greg Neagle
bdefc367b3 Fix so an empty receipts array doesn't cause an unhandled exception 
git-svn-id: http://munki.googlecode.com/svn/trunk@674 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-25 15:05:05 +00:00
Greg Neagle
7dfac4190e Convert pid to integer before passing it to os.kill() 
git-svn-id: http://munki.googlecode.com/svn/trunk@673 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-24 21:07:08 +00:00
Greg Neagle
889ce233bd Changes to installing Adobe CS5 AAMEE packages at the loginwindow so that Adobe AIR apps get installed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@672 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-24 18:58:04 +00:00
Greg Neagle
255271ed6e Fixed use of new munki pref "SuppressUserNotification" in managedsoftwareupdate 
git-svn-id: http://munki.googlecode.com/svn/trunk@664 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-14 18:22:46 +00:00
Greg Neagle
e5c160b86f Changes to progress info on Adobe installs/uninstalls; fix so completed payloads are not repeated in ManagedSoftwareUpdate.log 
git-svn-id: http://munki.googlecode.com/svn/trunk@661 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-05 17:38:27 +00:00
Greg Neagle
235ce74b25 Better exception handling. 
git-svn-id: http://munki.googlecode.com/svn/trunk@660 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:08:55 +00:00
Greg Neagle
3b32e199de New FoundationPlistException base class; NSPropertyListSerializationException and NSPropertyListWriteException now inherit from FoundationPlistException 
git-svn-id: http://munki.googlecode.com/svn/trunk@659 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:08:25 +00:00
Greg Neagle
c3188102e7 Improved exception handling 
git-svn-id: http://munki.googlecode.com/svn/trunk@658 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:07:18 +00:00
Greg Neagle
981afa2e3a Improved exception handling 
git-svn-id: http://munki.googlecode.com/svn/trunk@657 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:06:54 +00:00
Greg Neagle
aa07c5a726 pylint cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@656 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:05:05 +00:00
Greg Neagle
c05fd84372 pylint cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@655 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 23:03:26 +00:00
Greg Neagle
915679291f Move getmd5hash to munkicommon. 
git-svn-id: http://munki.googlecode.com/svn/trunk@654 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-04 22:49:05 +00:00