Heig Gregorian
855fb9986c
Revert "Converted '--configure' option as a callback."
...
This reverts commit a2c593be9c
2012-05-03 18:54:22 -07:00
Heig Gregorian
f4f72174be
Added new function to read an option_value as either a plain string or path to file
...
Since adding the '--notes' option, which can either be a simple string
or the contents of a file (if a valid path is supplied), this same
functionality has been extended to the '--description' option.
Providing a function so that this same operation can be used in other
areas seemed like the logical thing to do.
2012-05-03 11:14:34 -07:00
Heig Gregorian
a2c593be9c
Converted '--configure' option as a callback.
...
--configure as a callback eliminates the need to check if the option
has been set to 'True'
2012-05-03 09:03:15 -07:00
Heig Gregorian
557ada518c
Changes to how the 'installer_item' is removed from 'arguments' (presumed to be options for 'makepkginfo'). Removed redundant options which can now be referenced as 'makepkginfo' options. Nicer error reporting for 'makepkginfo' options failure
2012-05-02 21:01:48 -07:00
Heig Gregorian
01c3db99e6
Added alternate option names for 3 items specified as options in 'munkiimport' which are now present as options for 'makepkginfo'
2012-05-02 20:56:43 -07:00
Heig Gregorian
e74ecb583d
Re-worked handling of passing 'makepkginfo' options through 'munkiimport'
...
'--makepkginfo-options' option has been removed in favor of providing
'makepkginfo' options alongside options native to 'munkiimport'.
This is accomplished by collecting all unknown options into
'arguments', which includes '/path/to/installer_item'.
Keeping with conventions typical for performing operations on a file,
'/path/to/installer_item' should always be last.
2012-05-02 13:08:41 -07:00
Heig Gregorian
6d45a7108b
'--notes' option added
...
Notes provide an area for administrators to store information that is
purely reserved for administrative use and not considered in any type
of munki processing.
2012-05-01 18:35:33 -07:00
Heig Gregorian
c8ad63c707
Added tolerance to '--RestartAction' option
...
If a valid restart action is not provided, use best guess by keying
words "restart" and "logout" if they're provided within the argument's
string.
2012-05-01 15:43:30 -07:00
Heig Gregorian
463f3f2b61
Merge branch 'master' into makepkginfo
2012-05-01 14:41:42 -07:00
Heig Gregorian
534a8a1ac5
Usage information updates for "update_for, requires, and blocking_applications"
2012-05-01 14:37:17 -07:00
Greg Neagle
58bada0a5b
More localization tweaks.
2012-05-01 14:31:20 -07:00
Heig Gregorian
bafb9a1701
'--autoremove' option added for 'makepkginfo'
...
Improved option usage information.
2012-05-01 14:22:09 -07:00
Heig Gregorian
03e6ddc1aa
Three new array options for 'makepkginfo' added
...
--update_for - populates the 'update_for' array
--requires - populates the 'requires' array
--blocking_applications - populates the 'blocking_applications' array
2012-05-01 14:16:22 -07:00
Greg Neagle
620bb386e9
Adjust button sizes in Managed Software Update.app
2012-05-01 14:13:35 -07:00
Heig Gregorian
bd42067450
Added '--RestartAction' option to 'makepkginfo'
...
Valid actions that can be specified are:
RequireRestart
RequireLogout
RecommendRestart
2012-05-01 13:44:33 -07:00
Heig Gregorian
27e820f6c4
Minor usage update to '--makepkginfo-options'
2012-05-01 12:01:32 -07:00
Heig Gregorian
8aa107c843
Revert "Removed redundant options in 'munkiimport' as they are now present in 'makepkginfo' and can be triggered using the '--makepkginfo-options=' option."
...
This reverts commit 3349335fa7
2012-05-01 11:59:56 -07:00
Heig Gregorian
b4ba365fe9
Added '--force_install_after_date' option to 'makepkginfo'; uses a new function defined in 'munkicommon.py' for validation (see below).
...
munkicommon.validateForceInstallAfterDateFormat may be useful in other
areas.
The function is tolerant to some "errors" such as single-digit month or
day or even two-digit year.
2012-05-01 11:39:16 -07:00
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
Greg Neagle
3814c70c26
Add initial French localization based on Claude Perrin's work
2012-05-01 11:18:18 -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
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
d95481b93e
Merge branch 'dev' of http://code.google.com/r/theheig-conditionals
2012-03-13 21:16:32 -07: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
