mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 05:59:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,607 Commits 9 Branches 111 Tags
d2fc890842e0070a0c5d8d1f78fad72dc4aa93fd
Commit Graph

1128 Commits

Author SHA1 Message Date
Greg Neagle
79093c048f Merging Arjen's MUNKI_VERBOSITY_LEVEL environment variable 2014-06-24 15:39:02 -07:00
Arjen van Bochoven
2af6c13f87 Renamed VERBOSE to MUNKI_VERBOSITY_LEVEL 2014-06-25 00:23:32 +02:00
Greg Neagle
861a6a3d9d Add missing module name in munkiimport's generate_pngs_from_installer_pkg; fixes a crash when extracting an icon from a pkg item 2014-06-24 14:05:00 -07:00
Arjen van Bochoven
62986bac54 Store verbosity level in environment variable 
Pre- and post-flight scripts can use verbosity level from managedinstall
 2014-06-23 23:33:04 +02:00
Greg Neagle
7553e942e7 Refactor iconimporter to use munkilib/iconutils.py; fix some broken error reporting in munkilib/iconutils.py 2014-06-19 21:33:31 -07:00
Greg Neagle
90752e2f97 When running managedsoftwareupdate in --auto mode, if the Munki repo server is not available, do not exit immediately, but attempt to install any cached updates (either those marked for unattended_install or if at the loginwindow, all updates) 2014-06-19 15:12:13 -07:00
Greg Neagle
b24b7814b0 Add RestartAction to available keys in optional_installs items so that MSC.app can display the info. 2014-06-19 08:29:51 -07:00
Greg Neagle
aa770ad3a6 Revert "Initial stab at replacing curl with NSURLConnection and friends." 
This reverts commit 56c856e469.
 2014-06-16 15:35:27 -07:00
Greg Neagle
31ede658b6 Revert "Convert SSL error to string (from tuple) before displaying the error." 
This reverts commit cf6c189bd9.
 2014-06-16 15:35:26 -07:00
Greg Neagle
6203226244 Revert "keychain module added to import existing certs/keys into a keychain for use by gurl" 
This reverts commit 42b6c62aeb.
 2014-06-16 15:35:24 -07:00
Greg Neagle
1f11a84f0d Revert "Change all 'security' keychain references to use the full pathname" 
This reverts commit 6443a43952.
 2014-06-16 15:35:22 -07:00
Greg Neagle
5176ed1e36 Revert "When adding a trusted cert, modify admin Trust Settings (instead of user) so that a GUI authentication dialog is not displayed." 
This reverts commit 6814c166e7.
 2014-06-16 15:35:18 -07:00
Greg Neagle
d824dea3c1 Revert "Display debugging information for keychain operations and SSL errors" 
This reverts commit a2872b768f.
 2014-06-16 15:35:17 -07:00
Greg Neagle
97ec890146 Revert "Add missing 'import keychain' to fetch.py" 
This reverts commit 6644b958de.
 2014-06-16 15:35:15 -07:00
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