mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-07 12:59:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,787 Commits 10 Branches 120 Tags
135fa8f2d3e2fbbaf21d02f40ba13c80fd5edd08
Commit Graph

1164 Commits

Author SHA1 Message Date
Greg Neagle 11173143c5 Revert "keychain.security now returns error output if stdout is empty. Needed to get output from 'security show-keychain-info'" 
This reverts commit e035aeb893.
 2014-06-16 15:35:10 -07:00
Greg Neagle c86d9a536f Revert all NSURL commits. 
Revert "Move keychain location back into root's home dir"

This reverts commit 78b88bc10c.
 2014-06-16 15:34:22 -07:00
Greg Neagle 78b88bc10c Move keychain location back into root's home dir 2014-06-10 15:20:04 -07:00
Greg Neagle e035aeb893 keychain.security now returns error output if stdout is empty. Needed to get output from 'security show-keychain-info' 2014-06-10 11:51:23 -07:00
Greg Neagle 6644b958de Add missing 'import keychain' to fetch.py 2014-06-10 11:29:58 -07:00
Greg Neagle a2872b768f Display debugging information for keychain operations and SSL errors 2014-06-10 11:21:35 -07:00
Greg Neagle 6814c166e7 When adding a trusted cert, modify admin Trust Settings (instead of user) so that a GUI authentication dialog is not displayed. 2014-06-10 09:37:15 -07:00
Greg Neagle 6443a43952 Change all 'security' keychain references to use the full pathname 2014-06-10 08:15:36 -07:00
Greg Neagle 42b6c62aeb keychain module added to import existing certs/keys into a keychain for use by gurl 2014-06-10 06:34:51 -07:00
Greg Neagle cf6c189bd9 Convert SSL error to string (from tuple) before displaying the error. 2014-06-09 12:06:56 -07:00
Greg Neagle 56c856e469 Initial stab at replacing curl with NSURLConnection and friends. 2014-06-09 11:50:45 -07:00
Justin McWilliams 80746ac975 In munkicommon.comparePlistVersion, protect against a plist parsing as NSCFString, not NSCFDictionary as expected, avoiding the following traceback: 
File "/usr/local/munki/managedsoftwareupdate", line 664, in main
   updatecheckresult = updatecheck.check(client_id=options.id)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2777, in check
   installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2071, in processManifestForKey
   processOptionalInstall(item, cataloglist, installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1565, in processOptionalInstall
   iteminfo['installed'] = someVersionInstalled(item_pl)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1281, in someVersionInstalled
   if compareItemVersion(item) == 0:
 File "/usr/local/munki/munkilib/updatecheck.py", line 645, in compareItemVersion
   return compareApplicationVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 400, in compareApplicationVersion
   return compareBundleVersion(app)
 File "/usr/local/munki/munkilib/updatecheck.py", line 517, in compareBundleVersion
   compare_result = comparePlistVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 562, in comparePlistVersion
   installedvers = munkicommon.getVersionString(plist)
 File "/usr/local/munki/munkilib/munkicommon.py", line 1345, in getVersionString
   if plist.get(key):
  AttributeError: '__NSCFString' object has no attribute 'get'
 2014-05-30 15:01:19 -07:00
Greg Neagle b431eb4d18 Workaround for non-ASCII characters in version strings. 2014-05-30 15:00:02 -07:00
Greg Neagle 12e9af2724 Workaround for non-ASCII characters in version strings. 2014-05-30 14:55:44 -07:00
Greg Neagle b390c7f46f munkiimport now offers to extract and upload product icons 2014-05-21 16:15:38 -07:00
Greg Neagle 7b6d99c368 Remove duplicate file named iconimporter.py (duplicate of iconimporter) 2014-05-15 13:44:21 -07:00
Greg Neagle bf60710145 Add latest version of iconimporter tool 2014-05-14 13:33:46 -07:00
Greg Neagle 50cf42f9ed Update comments in download_client_resources() to reflect actual behavior 2014-05-13 15:10:07 -07:00
Greg Neagle f932d1d8b1 Change 'ClientResourceURLs' to 'ClientResourceURL' for consistency with other alternate URL keys 2014-05-13 10:43:52 -07:00
Greg Neagle 36e61a0087 Check for and download custom client resources if available 2014-05-12 10:45:37 -07:00
Justin McWilliams 35ed6c7ad0 In munkicommon.comparePlistVersion, protect against a plist parsing as NSCFString, not NSCFDictionary as expected, avoiding the following traceback: 
File "/usr/local/munki/managedsoftwareupdate", line 664, in main
   updatecheckresult = updatecheck.check(client_id=options.id)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2777, in check
   installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2071, in processManifestForKey
   processOptionalInstall(item, cataloglist, installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1565, in processOptionalInstall
   iteminfo['installed'] = someVersionInstalled(item_pl)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1281, in someVersionInstalled
   if compareItemVersion(item) == 0:
 File "/usr/local/munki/munkilib/updatecheck.py", line 645, in compareItemVersion
   return compareApplicationVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 400, in compareApplicationVersion
   return compareBundleVersion(app)
 File "/usr/local/munki/munkilib/updatecheck.py", line 517, in compareBundleVersion
   compare_result = comparePlistVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 562, in comparePlistVersion
   installedvers = munkicommon.getVersionString(plist)
 File "/usr/local/munki/munkilib/munkicommon.py", line 1345, in getVersionString
   if plist.get(key):
  AttributeError: '__NSCFString' object has no attribute 'get'
 2014-04-29 15:51:12 -04:00
Greg Neagle 553ac2bc42 Record install and removal errors to InstallInfo.plist for use by Managed Software Center.app 2014-04-07 10:28:01 -07:00
Greg Neagle e90cfccc6f Add options for --category, --developer, and --icon-name to munkiimport for future use in Munki 2 2014-03-26 16:37:44 -07:00
Greg Neagle 4f2dd83b35 Handle all paths and path fragments as Unicode 2014-03-26 14:31:35 -07:00
Greg Neagle 1dc5f33eda Add some Munki 2 pkginfo fields to munkiimport. 2014-03-25 14:05:06 -07:00
Greg Neagle 3c25bc2a65 Properly create missing icons directory in munki repo. 2014-03-25 13:56:51 -07:00
Greg Neagle 77785f589a Remove prompt for icon_name on import; this often leads to undesireable results. 2014-03-25 09:02:06 -07:00
Greg Neagle ddf08cb0c0 Properly handle mpkgs that contain other mpkgs (!) 2014-03-25 08:39:41 -07:00
Greg Neagle 8090ce5817 Better icon extraction from flat packages that aren't distribution pkgs 2014-03-24 16:13:16 -07:00
Greg Neagle acdd39c035 Use FoundationPlist to read our local prefs 2014-03-24 15:12:35 -07:00
Greg Neagle c03cb77fff Added iconimporter tool 2014-03-24 15:01:31 -07:00
Greg Neagle 8e58aec918 Don't warn when we can't download an icon; just do debug1 output. Was generating a lot of noise. 2014-03-24 11:47:09 -07:00
Greg Neagle d343ede672 Add support for product icon downloads from Munki server 2014-03-24 10:21:42 -07:00
Greg Neagle c0d96c31fd Allow non-root user to run managedsoftwareupdate --version 2014-03-22 19:50:35 -07:00
Greg Neagle 085e659e97 Don't raise an exception when processing removals and a manifest refers to a non-existent catalog 2014-03-22 09:22:10 -07:00
Greg Neagle 06cbcd9249 Don't raise an exception when processing removals and a manifest refers to a non-existent catalog 2014-03-22 09:16:23 -07:00
Greg Neagle 72fd2ad0e6 Display insufficent disk space info if relevant 2014-03-17 16:05:12 -07:00
Greg Neagle 7643f03052 Handle optional items that are required by other optional items 2014-03-16 10:57:00 -07:00
Greg Neagle 20a8466836 Send an update notification after a 'managedsoftwareupdate --installonly' run so any open instance of MSC.app updates its display 2014-03-14 16:21:27 -07:00
Greg Neagle 52695b9c6a After a successful install, set 'needs_update' to false for optional item info. Fixes issue 293 2014-03-14 16:19:42 -07:00
Greg Neagle 61dccd3fbb installer.py should not raise an exception if 'RemovalResults' or 'InstallResults' is missing from the report. 2014-03-11 16:32:12 -07:00
Greg Neagle 64593614de Add support for category, developer and icon_name to munkiimport 2014-03-03 10:38:47 -08:00
Greg Neagle 044f6ab9d7 Add --category, --developer, and --icon-name options to makepkginfo 2014-03-03 10:32:13 -08:00
Greg Neagle 142d323772 Copy category, developer and icon_name if available to managed_installs and removals in InstallInfo.plist for use by Managed Software Center.app 2014-03-02 16:03:18 -08:00
Greg Neagle fd1c44e73c Copy category, developer and icon_name if availble to optional_installs in InstallInfo.plist for use by Managed Software Center.app 2014-03-02 15:14:57 -08:00
Greg Neagle 7b67bf4455 Refactoring code in Managed Software Center.app into smaller source modules 2014-02-24 14:55:17 -08:00
Greg Neagle 64597994ae Make sure the need to restart is not lost when Munki updates need a restart but Apple updates do not. 2014-02-21 08:43:11 -08:00
Greg Neagle 3bc78d53a2 Make sure the need to restart is not lost when Munki updates need a restart but Apple updates do not. 2014-02-21 08:35:11 -08:00
Greg Neagle f3ec0e0bbd Changes to make updates after a Munki session completes visually smoother, elimnating the reload flash when possible. 2014-02-20 15:17:35 -08:00
Greg Neagle f2c3f66420 implement more of the inter-process plumbing, including monitoring the managedsoftwareupdate process for failure to start or unexpected termination 2014-02-18 17:44:01 -08:00