mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-26 17:09:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
956 Commits 11 Branches 113 Tags
ee07c2be86caa38ff211c8a4f85b67b59096a67d
Commit Graph

54 Commits

Author SHA1 Message Date
Justin McWilliams
89e2ab8b81 Move getPIDforProcessName() out of munkicommon and into utils, so it can be 
used in modules that munkicommon also imports.
 2012-02-10 18:05:51 -05:00
Greg Neagle
05e6aa57e9 Adobe CS4 installs now attempt to kill stalled Adobe AIR processes, just like CS5 installs. This allows installs at the loginwindow to succeed. 2012-02-09 08:28:21 -08:00
Greg Neagle
02a8b0cfc6 Move getPIDforProcessName into munkicommon for use by both munkistatus and adobeutils 2012-02-04 12:13:46 -08:00
Greg Neagle
c916885e03 Added munkicommon.display_status_major and renamed munkicommon.display_status to munkicommon.display_status_minor; changes to more closely map the munkistatus-style output to the stdout-style output 2011-12-21 11:28:52 -08:00
MagerValp
986a45d395 Reverting r1186, library files don't require executable bit. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1187 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-20 13:35:09 +00:00
MagerValp
c3fb0ff0ec Fixed missing executable bit. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1186 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-05-20 09:31:24 +00:00
Greg Neagle
1c9e5784c1 - forced_installs and forced_uninstalls now work with items that are part of a dependency relationship 
- makecatalogs now has no OS X-specific dependencies

- munkiimport fixes for repos hosted via SMB/CIFS.

git-svn-id: http://munki.googlecode.com/svn/trunk@1097 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-04-06 21:54:29 +00:00
Greg Neagle
69705bb33e Change version number handling to eliminate padding/truncating version numbers to five positions (ala 1.0.0.0.0). 
git-svn-id: http://munki.googlecode.com/svn/trunk@1016 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-01-31 21:38:47 +00:00
Greg Neagle
a853f78c9f Update copyright dates across the board. 
git-svn-id: http://munki.googlecode.com/svn/trunk@1010 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2011-01-25 18:22:14 +00:00
John Randolph
ffe6722d87 wrap os.listdir() to decode utf-8 unicode into unicode objects 
change all code locations using os.listdir() to use munkicommon.listdir()



git-svn-id: http://munki.googlecode.com/svn/trunk@941 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-30 16:28:45 +00:00
Greg Neagle
b52f45cdf0 More print statement cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@821 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-19 17:22:55 +00:00
Greg Neagle
efdd7628bd Changed munkicommon.getAppData() to use LaunchServices instead of Apple System Profiler. LaunchServices is faster and returns more apps than System Profiler, especially on Leopard systems. Thanks to John Randolph. 
git-svn-id: http://munki.googlecode.com/svn/trunk@787 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-13 17:32:53 +00:00
Greg Neagle
4d9af60e5a updateAcrobatPro: when looking for the apps to update, first look in /Applications/Adobe Acrobat 9 Pro/ before asking system_profiler to search. 
git-svn-id: http://munki.googlecode.com/svn/trunk@782 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-07 18:34:44 +00:00
Greg Neagle
1dab884671 Replace separate instances of getAppData() in adobeutils.py and updatecheck.py with a single implementation in munkicommon. 
git-svn-id: http://munki.googlecode.com/svn/trunk@781 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-07 18:07:50 +00:00
Greg Neagle
6aaddbfe7f Attempt to be a little smarter about which payloads we add to the installs list for Adobe CS5 updaters when generating pkginfo. Now we look for a payload whose name matches that of the overall update and add only that payload if it exists, falling back to the previous behavior if it does not. 
git-svn-id: http://munki.googlecode.com/svn/trunk@779 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-06 18:19: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
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
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
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
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
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
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
ba1f9f823f pylint cleanups 
git-svn-id: http://munki.googlecode.com/svn/trunk@645 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-03 23:42:09 +00:00
Greg Neagle
74bc912929 New comment. 
git-svn-id: http://munki.googlecode.com/svn/trunk@644 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-03 22:06:22 +00:00
Greg Neagle
9de06a2b75 Cleaned up/simplified the Adobe log processing used to generate progress info. 
git-svn-id: http://munki.googlecode.com/svn/trunk@643 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-08-03 21:26:27 +00:00
Greg Neagle
a2e227d18f Move restart logic out of this module and back into installer.py 
When building installs items for use with makepkginfo, skip Language Packs.

git-svn-id: http://munki.googlecode.com/svn/trunk@631 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-30 22:06:10 +00:00
Greg Neagle
d017f8be80 runAdobeCS5PatchInstaller can now optionally copy the dmg contents to the local disk before install to work around a bug in the AdobePatchInstaller. 
add
<key>copy_local</key>
<true/>

to the relevant pkginfo.

git-svn-id: http://munki.googlecode.com/svn/trunk@627 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-30 00:01:10 +00:00
Greg Neagle
88e2969d95 adobeutils.getAdobeCatalogInfo (used my makepkginfo) now generates installs items for CS5 updates, based on payload information. 
git-svn-id: http://munki.googlecode.com/svn/trunk@624 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-29 19:41:08 +00:00
Greg Neagle
f7595cb979 Added support for installing Adobe CS5 products packaged with AAMEE tool. Removed support for "naked" (unpackaged) CS5 installs. 
-appdmg flag to makepkginfo causes it to make old-style appdmg info if appropriate.

git-svn-id: http://munki.googlecode.com/svn/trunk@613 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-28 23:54:38 +00:00
Greg Neagle
83ed22f3af installer.py: new copyFromDMG method that copies an arbitrary list of items from a mounted DMG to specified locations. 
New removeCopiedItems method that removes the same list of items from the startup disk.


updatecheck.py: support for new copy_from_dmg and remove_copied_items methods.

makepkginfo: support for making pkginfo with new copy_from_dmg method,

git-svn-id: http://munki.googlecode.com/svn/trunk@603 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-26 23:26:25 +00:00
Greg Neagle
7ed8902807 Updated for Photoshop CS5 12.0.1 updater 
git-svn-id: http://munki.googlecode.com/svn/trunk@572 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-07-06 19:00:06 +00:00
Greg Neagle
819335c316 Bug fix for CS3 removal (modulename carried over from move of code from installer.py to adobeutils.py) 
git-svn-id: http://munki.googlecode.com/svn/trunk@553 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-06-21 18:24:47 +00:00
Greg Neagle
fa860b71ef More Adobe CS5 support. 
git-svn-id: http://munki.googlecode.com/svn/trunk@552 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-06-21 17:42:30 +00:00
Greg Neagle
3f35305a42 More CS5 changes. Now handle the AdobePatchInstaller included with CS5 updates. 
git-svn-id: http://munki.googlecode.com/svn/trunk@551 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-06-18 22:24:47 +00:00
Greg Neagle
01fabd0bf8 More changes to prep for CS5 deployment. 
git-svn-id: http://munki.googlecode.com/svn/trunk@543 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-06-02 22:04:18 +00:00
Greg Neagle
cad13c0fd7 Start of changes to support Adobe CS5 deployment. 
git-svn-id: http://munki.googlecode.com/svn/trunk@539 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-05-26 17:03:28 +00:00
Greg Neagle
54ac0b4f1a Updated comments. 
git-svn-id: http://munki.googlecode.com/svn/trunk@472 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-02-23 17:11:04 +00:00
Greg Neagle
d6908fdd52 Fixed typos in adobeSetupError() 
git-svn-id: http://munki.googlecode.com/svn/trunk@467 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-02-20 18:03:12 +00:00
Greg Neagle
6125f77293 Changes to support installation of Adobe Acrobat Pro 9 updates. 
git-svn-id: http://munki.googlecode.com/svn/trunk@415 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-12-24 20:27:33 +00:00
Greg Neagle
5a7e380c55 In getAdobeSetupInfo(), now print payload info even if there's only one payload Payload info now includes AdobeCode, which can be useful for building Installs items. 
git-svn-id: http://munki.googlecode.com/svn/trunk@413 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-12-19 05:14:56 +00:00
Greg Neagle
60de387e48 added check for munkicommon.munkistatusoutput in runAdobeInstallTool so we don't try to call MunkiStatus when not needed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@410 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-12-16 18:43:51 +00:00
Greg Neagle
fc7570449b Cleanup of exception handling 
git-svn-id: http://munki.googlecode.com/svn/trunk@358 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 05:16:58 +00:00
Greg Neagle
27a3a78814 More line length cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@342 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 22:35:20 +00:00
Greg Neagle
1fafb43fc2 Line length cleanup ala PEP-8 
git-svn-id: http://munki.googlecode.com/svn/trunk@341 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 22:30:32 +00:00
Greg Neagle
7a71abc5e5 Fixed another typo in runAdobeSetup() 
git-svn-id: http://munki.googlecode.com/svn/trunk@331 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 21:41:28 +00:00
Greg Neagle
dcc71ab6ed Fixed typo in runAdobeSetup() for the installxml deployment file. 
git-svn-id: http://munki.googlecode.com/svn/trunk@330 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 21:38:55 +00:00
Greg Neagle
425e9c6591 makepkginfo can now create pkginfo for Adobe CS3 installers; better metadata for CS4 installers as well. 
git-svn-id: http://munki.googlecode.com/svn/trunk@329 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 19:56:51 +00:00
Greg Neagle
ed1b8a637f Refactored the runAdobeSetup() and runAdobeUberTool() functions, moving shared code to runAdobeInstallTool(). 
Fixed typos in adobeSetupError()

Added code to runAdobeSetup() to begin support for CS3 Deployment packages. (Currently untested)

git-svn-id: http://munki.googlecode.com/svn/trunk@325 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 17:15:43 +00:00
Greg Neagle
b4beeafcfe Lots of logging and reporting changes. 
Added munkicommon.validPlist() to check for plist validity when getting a manifest or catalog file.
Added call to updatecheck.checkServer() to test for server availability before doing a check for updates.

git-svn-id: http://munki.googlecode.com/svn/trunk@319 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-11 23:38:12 +00:00