mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-18 13:10:11 -06:00
Code Issues Packages Projects Releases Wiki Activity
234 Commits 9 Branches 112 Tags
5ea46d211bbc26c6b4589f334e01fad6efd12f84
Commit Graph

208 Commits

Author SHA1 Message Date
Greg Neagle
5ea46d211b PEP-8 line length cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@355 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 04:15:59 +00:00
Greg Neagle
5aa68dbe00 PEP-8 line length cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@354 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 04:14:13 +00:00
Greg Neagle
cdba90d75e PEP-8 cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@353 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 02:22:49 +00:00
Greg Neagle
3b7d335b04 More PEP-8 cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@352 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 02:03:05 +00:00
Greg Neagle
4456101d14 PEP-8 cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@351 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 01:45:04 +00:00
Greg Neagle
510ca09f0e More PEP-8 cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@350 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 01:43:13 +00:00
Greg Neagle
d34876af17 Line length cleanup ala PEP-8 
git-svn-id: http://munki.googlecode.com/svn/trunk@349 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 01:39:16 +00:00
Greg Neagle
00f7ba39e5 PEP-8 line length cleanup. Wasn't sure how to break the sqlite3 commands, so left them alone. 
git-svn-id: http://munki.googlecode.com/svn/trunk@348 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-18 00:04:54 +00:00
Greg Neagle
8e7811cea2 PEP-8 formatting cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@347 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 23:38:21 +00:00
Greg Neagle
893a0c8919 More PEP-8 cleanup 
git-svn-id: http://munki.googlecode.com/svn/trunk@346 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 23:36:53 +00:00
Greg Neagle
4c29533bac Reformatted line lengths to comply with PEP-8 
git-svn-id: http://munki.googlecode.com/svn/trunk@345 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 23:31:04 +00:00
Greg Neagle
40eaea927b Attempt to adjust line lengths to comply with PEP-8, but long Cocoa method names make it impossible. 
git-svn-id: http://munki.googlecode.com/svn/trunk@344 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 22:58:58 +00:00
Greg Neagle
d9decdec8d Line length cleanup ala PEP-8 
git-svn-id: http://munki.googlecode.com/svn/trunk@343 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 22:53:55 +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
132ab42fd1 Line length cleanup ala PEP-8 
git-svn-id: http://munki.googlecode.com/svn/trunk@340 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-17 22:17:09 +00:00
Greg Neagle
3d4f6e345a More changes to support Adobe CS3 installs/uninstalls. 
pkginfo items with missing name or version attributes no longer cause an exception in updatecheck.py

Safer list comphrensions for various lists

git-svn-id: http://munki.googlecode.com/svn/trunk@333 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 23:57:22 +00:00
Greg Neagle
60b88af2af Workaround for unexpected output from /usr/bin/installer in getInstallerPkgInfo() (plist was preceded by extra non-plist output) 
git-svn-id: http://munki.googlecode.com/svn/trunk@332 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 22:08:25 +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
9351ba9bc6 Reorganized the if/then logic to make the flow with the various options a bit cleaner/clearer. 
git-svn-id: http://munki.googlecode.com/svn/trunk@328 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 17:25:16 +00:00
Greg Neagle
e165e62b49 git-svn-id: http://munki.googlecode.com/svn/trunk@327 a4e17f2e-e282-11dd-95e1-755cbddbdd66 2009-11-16 17:23:38 +00:00
Greg Neagle
84051d3e5e install() now resolves symlinks before passing them to /usr/bin/installer so that mpkgs that refer to relative paths to component packages can actually find the subpackages. 
copyAppFromDMG() now removes a pre-exising app in /Applications before copying the app from the DMG to more closely mimic the Finder behavior.
Fixed call the xattr in copyAppFromDMG()

installWithInfo() now only uses the first partition of a mounted diskimage, instead of all partitions. Added support for a new 'pkg_path' key to pkg info so an admin can specify a specific package to be installed from a disk image.

Begin support for uninstalling Adobe CS3 deployment packages (currently untested)


git-svn-id: http://munki.googlecode.com/svn/trunk@326 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-16 17:22: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
1e273f619a D'oh! Part two of fix for logoutinstalls with available Apple Updates, but no available munki updates 
git-svn-id: http://munki.googlecode.com/svn/trunk@323 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-12 00:19:17 +00:00
Greg Neagle
f80eff278b Logic changes to get proper logoutinstall behavior when there is an available Apple Update but no munki update. 
git-svn-id: http://munki.googlecode.com/svn/trunk@322 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-12 00:09:26 +00:00
Greg Neagle
9ff9879959 Bumped Managed Software Update.app to version 1.3.2. 
Added new alert for when app cannot check for updates because the manifest server is not accessible.

git-svn-id: http://munki.googlecode.com/svn/trunk@321 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-11 23:41:24 +00:00
Greg Neagle
d0c6b3ade4 Logging and reporting changes. 
Added check for server availability before starting an update session.

git-svn-id: http://munki.googlecode.com/svn/trunk@320 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-11 23:39:32 +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
Greg Neagle
d0854962d5 Bumped internal version to 0.4.7b 
git-svn-id: http://munki.googlecode.com/svn/trunk@318 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-05 17:44:39 +00:00
Greg Neagle
1b1d43b125 Added support for log rolling to managedsoftwareupdate. 
git-svn-id: http://munki.googlecode.com/svn/trunk@317 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-05 17:39:58 +00:00
Greg Neagle
3fa262ea69 - Lots of logging changes: new munkicommon.display_warning() function to more cleanly separate warnings from errors. New warnings.log, errors.log, and Installs.log. logs are now rotated, so they won't grow forever. 
- new munkicommon.pref keys: CatalogURL and PackageURL; these replace SoftwareRepoURL, and are base URLs for catalogs and installer items respectively. This allows you to divide up hosting of the munki pieces on multiple servers -- manifests and catalogs could be on one server, and the actual install packages on another.

git-svn-id: http://munki.googlecode.com/svn/trunk@316 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-05 17:38:39 +00:00
Greg Neagle
b3e8e1e69e processRemoval() now adds any updates to be removed to the list before it adds the main item. 
git-svn-id: http://munki.googlecode.com/svn/trunk@306 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 23:40:21 +00:00
Greg Neagle
6524802657 Renamed munkicommon.version() to munkicommon.get_version() to prevent name conflict with the version library from the distutil module. 
git-svn-id: http://munki.googlecode.com/svn/trunk@305 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 23:10:12 +00:00
Greg Neagle
0e4bc73db9 Added -V option to managedsoftwareupdate to print the version of the munki tools. 
git-svn-id: http://munki.googlecode.com/svn/trunk@304 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 18:57:45 +00:00
Greg Neagle
ff664ddea3 Added version() function to return the version of the munkitools. Used by managedsoftwareupdate -V. 
git-svn-id: http://munki.googlecode.com/svn/trunk@303 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 18:56:11 +00:00
Greg Neagle
b27031d3f9 - Changes to processInstall() so that if a specific version is given, it will not look for any updates. 
- When removing packages by receipts, and filtering by reference count results in an empty receipt list, print a warning and return False to indicate we cannot remove this item.
- the database of installed packages (built from receipt info) is now not generated until the first time we have to determine if we can remove an item using 'removepackages'. This should speed things up if there are no defined removals for a given client.


git-svn-id: http://munki.googlecode.com/svn/trunk@302 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 18:54:47 +00:00
Greg Neagle
5418c4ac53 Added try/except around removing Apple updates plist files. 
git-svn-id: http://munki.googlecode.com/svn/trunk@301 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-11-02 18:48:49 +00:00
Greg Neagle
b6f3444d2c munkistatus output tweak. 
git-svn-id: http://munki.googlecode.com/svn/trunk@300 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:29:40 +00:00
Greg Neagle
8d82225f84 Added support for a new 'update_for' key in pkginfo, so a package can be marked as an update for one or more seemingly unrelated packages. 
git-svn-id: http://munki.googlecode.com/svn/trunk@299 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:28:56 +00:00
Greg Neagle
b2ef8d288f Minor bug fixes and code cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@298 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:27:43 +00:00
Greg Neagle
13cdb31c28 Changes to output for better progress indication when there are multiple items to be installed or removed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@297 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-30 15:27:04 +00:00
Greg Neagle
fce4f6fab2 Added a check for diskimages with Software License Agreements. These cannot be automatically mounted by hdiutil, so they are useless to munki. 
git-svn-id: http://munki.googlecode.com/svn/trunk@295 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-23 22:58:56 +00:00
Greg Neagle
2141e264ee Fixed issue with removals in included manifests that don't have their own catalog lists, but instead rely on the parent's catalog list. 
git-svn-id: http://munki.googlecode.com/svn/trunk@294 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-23 17:46:18 +00:00
Greg Neagle
660a8a8e98 Added support for "appdmg" package type. This is a dmg that contains a single application at the root of the mounted dmg, which is then copied to /Applications (for install) or simply rm -rf /Applications/appname (for removal). 
makepkginfo generates pkginfo files for this package type, and updatecheck.py and installer.py have the appropriate additions.

git-svn-id: http://munki.googlecode.com/svn/trunk@279 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-22 21:42:57 +00:00
Greg Neagle
15cc60e8fe Bumped to version 1.3.1. 
Fixed a bug when there are items to be removed causing them not to be displayed.
Added a restart status field at the bottom of the window to be more like Apple Software Update.

git-svn-id: http://munki.googlecode.com/svn/trunk@278 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-22 21:39:41 +00:00
Greg Neagle
83e10ef4b6 Updated adobeutils.getAdobeUpdateInfo() to handle update DMGs with multiple payloads. 
Removed makeadobepkinfo, as its functionality has been merged into makepkginfo


git-svn-id: http://munki.googlecode.com/svn/trunk@277 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 22:04:49 +00:00
Greg Neagle
ebaf5ded27 Added getAdobeUpdateInfo() to parse Adobe update DMGs for pkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@276 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 18:56:26 +00:00
Greg Neagle
c88108f207 Merged makeadobepkginfo and makepkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@275 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2009-10-21 18:55:21 +00:00