Commit Graph

1321 Commits

Author SHA1 Message Date
Greg Neagle
b431eb4d18 Workaround for non-ASCII characters in version strings. 2014-05-30 15:00:02 -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
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
1dc5f33eda Add some Munki 2 pkginfo fields to munkiimport. 2014-03-25 14:05:06 -07:00
Claude PERRIN
e1c01a281d French Translation fix typo & add more translations strings from underlying command-line tools 2014-03-25 08:29:18 +01: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
e45a64cc53 Fix typo for 'Mandatory Updates Pending' alert 2014-02-27 13:55:54 -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
Justin McWilliams
bde50a7dca In addition to ManagedSoftwareUpdate.log, also log to /var/log/system.log when 'LogToSyslog' configuration is True. 2014-02-06 18:04:07 -05:00
Justin McWilliams
65dbbc5768 Log when removing temporary directory causes OSError or IOError 2014-02-06 17:22:19 -05:00
Claude PERRIN
5d7cdf7f73 French translation update fixing some mistakes 2014-01-28 09:44:44 +01:00
Greg Neagle
ae6bd497a3 Rename some name/display_name variables in processRemovals to better reflect their actual contents and purpose 2014-01-24 15:02:18 -08:00
Greg Neagle
8ea6dc51c6 Record item name and not display_name for name key in the report's 'RemovalResults'. Enables correct update of optional_installs installation status. 2014-01-24 14:42:20 -08:00
Greg Neagle
60b5bdd1a9 Change format of munkicommon.report['RemovalResults'] to a list of dictionaries instead of a list of strings. This may affect reporting products that use this info. InstallInfo.plist is now always rewritten to disk after an install session instead of being deleted in some cases. 2014-01-24 12:00:13 -08:00
Greg Neagle
1a2eb15100 Include installer_item_size and installed_size with optional_installs items that are installed. 2014-01-13 10:14:21 -08:00
Greg Neagle
77d686a213 urlquote hostname before using it as a ClientIdentifier. See issue 276. 2014-01-11 09:03:39 -08:00
Greg Neagle
84e482285e Missed some copyright info updates 2014-01-10 14:18:48 -08:00
Greg Neagle
fddd138000 Bumping version to 1.0.0. Updated copyright dates. 2014-01-10 08:20:15 -08:00
Greg Neagle
01e649084f Code formatting style cleanup in updatecheck.py 2013-12-17 09:56:10 -08:00
Justin McWilliams
b5006d2345 Revert Revision dcbfaa74bc, which randomized installs/removals order. This breaks dependencies chains which are baked into the list order. 2013-12-03 11:28:33 -05:00
Justin McWilliams
632c4e2aa0 Merge branch 'master' of https://code.google.com/p/munki 2013-12-03 10:33:57 -05:00
Justin McWilliams
dcbfaa74bc Randomize order of installs and removals, to prevent a single hanging/crashing/etc. package from continually preventing others from being processed. 2013-12-03 10:32:34 -05:00
Greg Neagle
b42f833850 Merge https://code.google.com/r/jessecpeterson-munki
Adding support for supported_architectures x86_64 for 64-bit computers running in i386 mode:
2013-12-01 18:46:31 -08:00
Justin McWilliams
4f67a5d50d Fix "%s downloaded at %d KB/s" string formatting to pass filename and download speed, not just download speed. 2013-11-26 13:10:57 -05:00
Justin McWilliams
3e26ca6ca1 s/munkicommon.log/munkicommon.display_detail/ when displaying package download speed. 2013-11-25 12:27:13 -05:00
Justin McWilliams
ddfedc5e36 Display and log HTTP headers when package downloads fail. 2013-11-25 12:25:56 -05:00
Justin McWilliams
c4dd44ea00 Fix issue where Info.plist CFBundleVersion containing unicode characters breaks Munki. 2013-11-25 12:24:19 -05:00
Justin McWilliams
3ba29fb128 Log the download speed for all package downloads. 2013-11-25 12:22:11 -05:00
Jesse Peterson
78902c68af Syntax fix 2013-11-23 13:22:03 -08:00
Jesse Peterson
21616710a2 supported_architectures x86_64 for 64-bit computers running in i386 mode. re: Munki issue #268 2013-11-23 13:18:44 -08:00
Greg Neagle
6e3555820a Fix for curl buffering headers output in Mavericks, causing progress display not to function. 2013-11-15 12:14:31 -08:00
Michael Lynn
468924f2b3 Allow changing curl path for 10.9 curl client-side cert workaround 2013-11-07 14:21:19 -08:00
Greg Neagle
d6906958c7 Always add catalog info to pkginfo. Fixes issue with --nopkg. Thanks to masonm@the-jci.org. 2013-11-05 15:20:49 -08:00
Greg Neagle
7da8af6700 Added new localized French message. Merci to iceman.grrrr@gmail.com 2013-11-05 15:04:51 -08:00
Greg Neagle
11aa83062f makepkginfo now inserts some user/environment metadata into generated pkginfo files. It stores the metadata under the '_metadata' key. makecatalogs now strips any key starting with _ from pkginfo before adding the pkginfo to a catalog. 2013-11-04 10:43:06 -08:00
Greg Neagle
48b1120e7d Small fix for firmware alert text code 2013-10-22 15:12:02 -07:00
Arjen van Bochoven
ca07f73d92 Expanded license_info_url check to if statement 2013-10-21 21:30:55 +02:00
Arjen van Bochoven
fcb7181830 Change query character to ampersand if the license_info_url contains an question mark. 2013-10-21 20:43:09 +02:00
Greg Neagle
96a16c2769 Detect Apple firmware updates and display a warning in Managed Software Update.app when the user chooses to install 2013-10-14 09:39:01 -07:00
Greg Neagle
f5d937be7e MSU.app Optional Software: if an update is available, allow installation. Previously if such and item did not also allow removal, MSU.app confusingly blocked installation. 2013-10-08 16:05:45 -07:00
Greg Neagle
33957f30f1 munkicommon.getPackageMetaData: If munkicommon.getInstallerPkgInfo(pkgitem) does not return any useful info, do not bail; instead continue on and attempt to get receipt info. If no receipt info, then return None. This works around an issue where some packages cause /usr/sbin/installer -info -pkg foo to crash. 2013-10-08 10:01:20 -07:00
Greg Neagle
036788722a Code formatting, line length, and whitespace cleanup 2013-10-08 09:30:29 -07:00
Greg Neagle
ec942c5992 Updated appleupdates.py with workarounds for changes in upcoming OS X releases. Bumped version to 0.9.2, since this is a non-trivial change. 2013-10-07 14:31:31 -07:00
Greg Neagle
543f2bf16f Change handling of (possibly) unicode strings in the munkicommon.display_foo functions to convert to ASCII, and to properly handle (possibly) unicode msg parameter when there are no additional arguments 2013-10-07 12:40:46 -07:00
Greg Neagle
eb3c5e120c PyLint fixes: remove spaces before EOLs 2013-10-04 12:10:21 -07:00
Greg Neagle
df4f7f2661 Make sure makePredicateInfoObject() doesn't throw an exception if munkicommon.report['StartTime'] is not defined. 2013-10-04 11:55:56 -07:00
Greg Neagle
0ba24a169b When getting list of available updates, honor the list of ignored updates 2013-10-01 14:26:06 -07:00
Greg Neagle
2ce6f6127c Merge branch 'makepkginfo-display_name' of https://github.com/hjuutilainen/munki 2013-09-03 09:25:05 -07:00
Greg Neagle
5beb7c85b3 in adobeutils.getPayloadInfo() handle the case of no xml and no .db 2013-08-20 11:13:48 -07:00
Michael Lynn
65ab4e4153 Added --nopkg option to set installer_type to nopkg
Moved several options (description, display name, name, version) outside of the argument-requiring code block to assist in nopkg pkginfo creation.
2013-08-13 10:36:57 -07:00