Commit Graph

1250 Commits

Author SHA1 Message Date
Greg Neagle 45de2d3b21 Changes to munkiimport: 1) Always append version number to uploaded dmg or pkg if not there originally; code clean up around the renaming. 2013-03-06 16:41:16 -08:00
Greg Neagle 000d1b969a PyLint cleanups in munkilib/installer.py. 2013-03-02 21:13:56 -08:00
Hannes Juutilainen 757a72d5ee Respect "version_comparison_key" when determining pkginfo version 2013-02-27 09:57:49 +02:00
Heig Gregorian 4847006300 Minor code clean-up, no functional changes 2013-02-22 17:17:26 -08:00
Heig Gregorian ed9a8b0913 Renamed updatecheck.getAppleUpdateMetaData to updatecheck.getPrimaryManifestCatalogs to reflect actual function; added function parameter to specify whether or not the primary client manifest and catalogs should be re-downloaded before parsing for apple_update_metadata
Additionally, ensure that MACHINE dict is populated regardless of the
runtype as it may impact how a primary manifest is discovered.
2013-02-22 15:29:15 -08:00
Greg Neagle 8bac537975 When getting blocking_applications from an Apple update dist file, de-dup the list of application-ids before finding matching applications. 2013-02-21 18:44:37 -08:00
Greg Neagle 141f3f24c6 Merge branch 'master' of https://code.google.com/p/munki 2013-02-19 17:09:53 -08:00
Greg Neagle 98de6685cc Merge of https://code.google.com/r/theheig-conditionals/ apple-update-metadata: Adds support for Munki-style metadata to Apple updates. 2013-02-19 17:09:40 -08:00
Heig Gregorian 27cbf06058 Minor inline comments added for clarification's sake 2013-02-19 15:15:11 -08:00
Heig Gregorian 53fc136d28 unattended_install in metadata no longer applied if a RestartAction exists (in original item or metadata); unattended Apple updates are skipped if a blocking application is running; installlist, holding Apple update installation results, only holds items which are eligible for unattended installation
Mostly, this commit involves improving upon expected functionality of
an unattend Apple update installation.

Munki performs a "suppressed" Apple software update check post
installation run if a GUI user is logged in such that the user will be
prompted to install any remaining updates.  This is inline with munki's
behavior for munki packages.

blocking_applications can now accept items which are full paths in case
an admin wishes to be specific regarding the location of a running,
blocking application and/or executable.

Also of note is a fix for previously broken blocking_application
checking for Apple updates, both in MSU and managaedsoftwareupdate.
2013-02-19 13:32:09 -08:00
Greg Neagle 8ec6291330 Add Russian to the localization build steps and gitignore the ru.lproj/MainMenu.xib. 2013-02-19 08:40:48 -08:00
Greg Neagle 3f612b9735 Merge https://code.google.com/r/hardrain79-russian-translation 2013-02-19 08:30:47 -08:00
Soldatenko Rostislav 4b23101487 Fixed some minor typos. 2013-02-19 13:39:20 +04:00
Greg Neagle 709c628838 Update to German language localization. Thanks to Steve Kueng. 2013-02-17 06:10:58 -08:00
Heig Gregorian a52acd73f8 Overall clean-up of adding install items to the list of parameters supplied in 'su_options' 2013-02-16 14:08:51 -08:00
Heig Gregorian b55c1c30af Minor message and comment update
Comment regarding limitations to installing Apple updates removed from
managedsoftwareupdate.  Warning message regarding missing
'installs/receipts' on import of an '--apple-update' item is not
displayed.
2013-02-16 13:20:25 -08:00
Heig Gregorian cd3c69b5a2 'unattended_install' and 'force_install_after_date' actions for Apple update are honored. Overall, functions were add/modified to support this effort. 2013-02-15 18:34:28 -08:00
Soldatenko Rostislav e5b2026967 Beta 1. 2013-02-15 16:34:32 +04:00
Soldatenko Rostislav 2e3387c171 Merge branch 'master' of https://code.google.com/r/hardrain79-russian-translation 2013-02-15 12:06:34 +04:00
Soldatenko Rostislav dbbc1f6f2d Work in progress 2013-02-15 12:05:35 +04:00
Greg Neagle d2eee5e268 When adding or removing Optional Software from the list of current installs, suppress Apple Update checks. 2013-02-14 16:23:06 -08:00
Greg Neagle b8416c7162 UI changes in Optional Software view in Managed Software Update.app 2013-02-14 15:17:12 -08:00
Rostislav Soldatenko 17b797ee15 Work in progress 2013-02-14 20:10:13 +04:00
Heig Gregorian e59555ff76 Minor clean-up; removed custom argument for updatecheck.getItemDetail, unusued self.apple_md variable removed from appleupdates 2013-02-13 16:00:38 -08:00
Heig Gregorian e2005a696b Significant changes to how Apple update items are matched to metadata; new function in updatecheck specifically created to handle collection of catalog data by appleupdates; new function created for applying metadata
Of note, 'copyUpdateMetadata' function uses a list of whitelisted
metadata keys as well as appropriate logic to determine if a particular
'RestartAction' should be applied.
2013-02-13 13:22:07 -08:00
Greg Neagle 881f9f0ae5 Fix a missed variable rename in MSUStatusWindowController.py 2013-02-13 11:53:29 -08:00
Greg Neagle 743b37ef03 Change text 'Logout and update' to 'Log out and update' to match Apple usage. Pylint line length cleanups. 2013-02-13 11:44:44 -08:00
Greg Neagle defd773d60 Some PyLint cleanups for makecatalogs 2013-02-12 20:19:41 -08:00
Greg Neagle d0a8735c21 Merge branch 'development' of https://github.com/hjuutilainen/munki 2013-02-12 20:13:42 -08:00
Greg Neagle 1c2a88b90b Merge https://code.google.com/r/thomastvegaard-danish-localization 2013-02-12 18:03:41 -08:00
Greg Neagle 731a470cbe Remove hack that allowed in-place editing of suggested/default values for prompts; does not work properly on remote sessions. 2013-02-12 13:42:10 -08:00
Heig Gregorian 9f8cd3a975 Initial commit adding client-side support for 'apple_update_metadata'
Provided that 'AppleSoftwareUpdatesOnly' preference is False, primary
client manifest's catalogs are parsed for matching
'apple_update_metadata' and applied to pending Apple updates.

Please note that not ALL keys presented by an apple_update_metadata
item are applied as to not either clobber or complicate the listing of
items provided in 'AppleUpdates.plist'.  The current list of excluded
keys is as follows:

catalogs
installed_size
installer_type
name
version
version_to_install
2013-02-12 13:23:45 -08:00
Heig Gregorian e25b5aacf7 Merged with munki master; manually resolved 'munkiimport' merge conflicts 2013-02-12 10:00:12 -08:00
Greg Neagle a3db265246 When checking for cached Apple updates, use self.GetSoftwareUpdateInfo() instead of self.WriteAppleUpdatesFile() to avoid writing the AppleUpdates.plist twice. 2013-02-12 09:15:52 -08:00
Heig Gregorian 4b322e1e43 Use underscores instead of hyphens for new installer_type
apple-update-metadata changed to apple_update_metadata
2013-02-12 08:51:14 -08:00
Greg Neagle 9f7a818edc Add new munkiimport preference for default catalog to use when no catalog is specified at the command line. Defaults to 'testing'. 2013-02-11 21:46:12 -08:00
Greg Neagle b80430753b Changes to allow Munki to check for and install Apple Software Update items in the same session as normal Munki updates. 2013-02-11 08:37:39 -08:00
Greg Neagle 4fd492662d Updated preferences manifest to add SuppressLoginwindowInstall key and correct description of SuppressAutoInstall key 2013-02-09 19:08:38 -08:00
Heig Gregorian d92127c241 Initial commit for new installer_type 'apple-update-metadata'
Using the new '--apple-update' option available in makepkginfo (and
therefore munkiimport), an admin can generate metadata pkginfo files
for Apple updates.  Supported metadata keys will modify munki's
behavior of the specified Apple update offered to the client.  Examples
would include 'force_install_after_date' and 'RestartAction'.  The
'makecatalogs' utility has also been updated to allow for this new
installer_type when creating catalogs.

NOTE: Client-side implementation is not included in this commit.  This
commit only deals with the creation of these specialized pkginfo files.
2013-02-06 13:53:43 -08:00
Greg Neagle a4ff92e4c6 Reset item[path] to original path after calling comparePlistVersion from compareBundleVersion. More debug output. 2013-02-05 10:06:10 -08:00
Greg Neagle 5ed68f819b makepkginfo -f now generates installs items with CFBundleShortVersionString and CFBundleVersion string keys if possible. 2013-02-04 16:05:05 -08:00
Greg Neagle 5feaa8ffd3 More clarifying comments in munkicommon.getVersionString() 2013-02-04 16:03:36 -08:00
Greg Neagle e3aef2bd7e Debug output tweaks when doing version comparisons 2013-02-04 15:14:47 -08:00
Greg Neagle 78d9ea6b49 Simplify implementation of compareBundleVersion() by just calling comparePlistVersion() to do the actual version comparison. Don't Repeat Yourself! 2013-02-04 15:00:21 -08:00
Greg Neagle 3c5d707ec1 Key name changes and behavior tweaks to Heig's submission for support for bundle/plist version keys other than CFBundleShortVersionString 2013-02-04 14:20:31 -08:00
Greg Neagle 20a0b51895 Fix typo in call to pkgutil --regexp --pkg-info-plist (was -pkg-info-plist). Thanks to Heig Gregorian. 2013-02-04 13:31:14 -08:00
Greg Neagle 19e06f73c9 Reset filelist2pkg config variable to defaults; removing my org's specific values. 2013-02-04 10:59:17 -08:00
Greg Neagle 097c6d8acb Merge branch 'versionkey' of https://code.google.com/r/theheig-conditionals 2013-02-04 10:46:24 -08:00
Greg Neagle 954dfe9934 Use readline and a OS X hack to allow editable default values when importing an item. 2013-01-28 13:58:16 -08:00
Greg Neagle 4b71ace130 Updated copyright info on all files with copyright info. 2013-01-28 11:55:09 -08:00