Commit Graph

1007 Commits

Author SHA1 Message Date
Heig Gregorian 3349335fa7 Removed redundant options in 'munkiimport' as they are now present in 'makepkginfo' and can be triggered using the '--makepkginfo-options=' option.
Minor update to usage for '-makepkginfo-options' and provided an
example.
2012-05-01 11:36:30 -07:00
Heig Gregorian 467899b5bd Relocated the import of the 'shlex' module to other module imports for clarity
Minor modification to construction of 'cmd' in 'def makePkgInfo'
2012-05-01 08:59:39 -07:00
Heig Gregorian 1e0d0842c7 Argument passed to 'getChoiceChangesXML' now matches the argument used in preceding calls to 'getPackageMetaData'
Minor usage note changed for '--installer_choices_xml' as well as
proper os_version comparison as to NOT exclude Mac OS X 10.6.6.

Modified 'munkicommon.getChoiceChangesXML' to return 'choices' even if
empty.
2012-05-01 08:49:46 -07:00
Heig Gregorian 9c5ade47d3 Option to pass 'makepkginfo-style' options added
Any option available to 'makepkginfo' can be specified using the
'makepkginfo-options' flag.

Example:

munkiimport --makepkginfo-options="-c production -c testing
--description='A good description' --unattended_install
--minimum_os_vers=10.6.8" /path/to/pkg-or-dmg"
2012-04-30 19:34:38 -07:00
Heig Gregorian ad90d63611 Options added to makepkginfo
--unattended_install
--unattended_uninstall
--minimum_os_version
--minimum_os_version
--installer_choices_xml (ONLY 10.6.6 or later)

Code to generate installer_choices_xml added to munkicommon.py library.
2012-04-30 18:53:55 -07:00
Heig Gregorian 5244f03e5a Merge branch 'master' into dev 2012-04-30 07:27:19 -07:00
Justin McWilliams 9efc4c7680 Fix ccb5f6b6cc -- move skipdirs into global const that's a prepopulated set of exclusion dirs. 2012-04-27 16:59:15 -04:00
ogle ccb5f6b6cc Add /private/* to the isExcludedFilesystem skipdirs.
Also, change skipdirs from a list to a set for far faster "in" operator performance.
2012-04-27 20:38:44 +00:00
Heig Gregorian 33e90e562e Merge branch 'master' into dev 2012-04-27 10:38:28 -07:00
Greg Neagle 39dcec0c44 Changes in updatecheck to better find installed items that have overlapping receipts with other items in the Munki repo. This specifically makes Munki better able to identify iLife'08 vs. iLife'09 vs. iLife'11, and therefore makes Munki actually capable of removing any of these, which was problematic before. 2012-04-27 10:28:32 -07:00
Greg Neagle f1f0846e2e Fix for munkicommon.getLSInstalledApplications(): use NSURL instead of FSRef, so no need to call LaunchServices.LSGetApplicationForURL(). Faster and hopefully more reliable. 2012-04-27 10:25:19 -07:00
Greg Neagle 3fcf49ffc4 Fix munkiimport to look in default install location for makecatalogs if makecatalogs is not found in same directory as munkiimport. Thanks to Heig Gregorian 2012-04-27 10:23:45 -07:00
Greg Neagle b5e9c4e607 Bump version.plist to 0.8.3 for next series of releases 2012-04-27 10:22:12 -07:00
Heig Gregorian ca5cc92277 Write all available conditions (admin-provided and built-in) to a 'Conditions' dict in 'ManagedInstallReport.plist'
Previously, admin-provided conditions were written to the
'ConditionalItems' dict.  Some built-in information was also being
written to the 'MachineInfo' dict, however this is not fully
representative of all built-in conditions that are collected.  Since
INFO_OBJECT is used as the basis for predicate comparison, its entirety
will be written to the 'Conditions' dict in
'ManagedInstallReport.plist', replacing 'ConditionalItems'.  The
'MachineInfo' dict will remain untouched as it is used for reporting
mechanisms.
2012-04-27 08:51:11 -07:00
Greg Neagle 2ac635afac add back the return of SoftwareUpdate's return code at the end of AppleUpdates._RunSoftwareUpdate(). Mistakenly removed on Feb 15 2012 in revision 2a1cf963e4 v0.8.2.1475.0 2012-04-13 13:55:46 -07:00
Justin McWilliams 37170e4915 Slow down a potential busy loop if MSU GUI is waiting for a restart alert to be dismissed. 2012-04-13 15:13:56 +05:30
Greg Neagle fc2b388209 Deprecation warning if install_type 'appdmg' is encountered; display error instead of just logging if we encounter an install_type we don't know how to handle. 2012-04-10 11:46:38 -07:00
Greg Neagle d67452e56a refactor of copying items from disk image to fix some logic errors. Thanks to raphendyr. 2012-04-10 11:36:07 -07:00
Greg Neagle 069c522bd9 Add CFBundleName definition to English.lproj/InfoPlist.strings 2012-04-10 10:32:21 -07:00
Greg Neagle a7876a84d1 Merge branch 'master' of https://code.google.com/p/munki 2012-04-03 09:22:37 -07:00
Greg Neagle d7236fce3a Fix for items marked for forced_install_after_date that also require logout or restart 2012-04-03 09:19:15 -07:00
ogle 6c243e74a0 s/Retreiving/Retrieving/ in 'Retreiving catalog "%s" ...' MSU message.
i before e except after c
2012-03-27 22:08:55 +00:00
Greg Neagle 21079ca718 Skip /.MobileBackups directory when scanning for apps; make sure all Exceptions are converted to strings before sendning to display_error 2012-03-25 19:21:54 -07:00
Greg Neagle b0e713fdda Fix a call to lookForUpdatesForVersion() with the wrong number of parameters 2012-03-22 14:58:58 -07:00
Greg Neagle 9ece677704 Merge branch 'master' of https://code.google.com/p/munki 2012-03-13 21:21:16 -07:00
Greg Neagle d95481b93e Merge branch 'dev' of http://code.google.com/r/theheig-conditionals 2012-03-13 21:16:32 -07:00
Justin McWilliams 6d8e927d72 Fix appleudpates_test.py 2012-03-13 21:09:13 -04:00
Greg Neagle 97c670bab4 appleupdates.py now generates blocking_applications lists for Apple updates 2012-03-13 17:22:54 -07:00
Heig Gregorian b42bec7aef Improved print-out for 'Found' updates 2012-03-09 10:43:09 -08:00
Greg Neagle 866c31ecd6 Changes in how we look for updates that have a version number appended 2012-03-08 11:20:20 -08:00
Greg Neagle 991567b262 Removed code/client/conditions as those are examples 2012-03-07 09:14:23 -08:00
Heig Gregorian 9f10a6a520 Better inline documentation and more descriptive key names 2012-03-05 12:09:38 -08:00
Heig Gregorian 2fde9b96d7 Remove Conditions.plist once CONDITIONS has been populated and output CONDITIONS to ManagedInstallReport.plist 2012-03-05 11:12:55 -08:00
Heig Gregorian ea16bc8e7a Example script clean-up 2012-03-05 11:03:45 -08:00
Heig Gregorian 020864673a Lookup ManagedInstallDir path instead of setting manually 2012-03-05 10:34:56 -08:00
Heig Gregorian 0f79dfc985 Added some additional inline documentation 2012-03-05 10:21:15 -08:00
Heig Gregorian f02b78b78e Don't process directories within conditions directory. Fixed variable name misspelling 2012-03-05 08:45:17 -08:00
Heig Gregorian 400411113e Basic .gitignore added to exclude test conditional items scripts 2012-03-05 08:30:30 -08:00
Heig Gregorian e2780c867e Validate plist before including in CONDITIONS dict 2012-03-05 08:13:21 -08:00
Heig Gregorian c6be815303 Removed changes to predicateEvaluatesAsTrue. Conditional scripts must now write output to ConditionalItems.plist which is then parsed to the CONDITIONS dict for inclusion into the INFO_OBJECT dict 2012-03-05 07:34:59 -08:00
Heig Gregorian afce440698 Initial commit for conditional items framework extension 2012-03-02 14:10:34 -08:00
Greg Neagle ba1238b452 Fix: forgot to replace plistlib.readPlistFromString with FoundationPlist.readPlistFromString when copying code from test environment. 2012-03-01 19:33:23 -08:00
Greg Neagle ee046b6dc9 ipv4_address is an available attribute for conditional_items; this attribute contains an array of active IPv4 addresses. A sample comparison might look like <string>ANY ipv4_address CONTAINS '192.168.161.'</string> 2012-03-01 17:06:58 -08:00
Greg Neagle 0cf1ad4089 Minor tweak when processing updates for items already installed and manifest specifies a version 2012-03-01 17:04:18 -08:00
Greg Neagle f97b63a9bf Better processing of requires and update_for items when names have versions appended. 2012-02-29 13:42:43 -08:00
Greg Neagle 00e0407d6e Merge branch 'cli' of https://code.google.com/r/davvid-munki-cli 2012-02-29 10:24:28 -08:00
Greg Neagle 7c910a1180 makecatalogs now skips all files that start with a period. Minor output tweak in munkiimport. 2012-02-28 20:58:07 -08:00
David Aguilar 3510b3b994 munkiimport: Add --unattended-install flag
Allow setting the 'unattended_install' package metadata
from the command-line.
2012-02-28 13:48:31 -08:00
David Aguilar 91bdbd6ec7 munkiimport: Add --min-os-ver and --max-os-ver options
Allow setting the maximum_os_version and minimum_os_version
package info fields from the command-line.
2012-02-28 11:30:17 -08:00
Greg Neagle 2d360448fa Fix undefined 'dirnames' error 2012-02-24 17:11:37 -08:00