mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-26 08:59:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant options in 'munkiimport' as they are now present in 'makepkginfo' and can be triggered using the '--makepkginfo-options=' option.

Browse Source 
Minor update to usage for '-makepkginfo-options' and provided an
example.
This commit is contained in:
Heig Gregorian
2012-05-01 11:36:30 -07:00
parent 467899b5bd
commit 3349335fa7
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/client/munkiimport
View File

@@ -526,16 +526,10 @@ def main():
p.add_option('--nointeractive', '-n', action='store_true',
help="""No interactive prompts. May cause a failure
if repo path is unavailable.""")
p.add_option('--makepkginfo-options', default=None, metavar='"MAKEPKGINFO OPTIONS"',
help="""These options will be passed to 'makepkginfo' for pkginfo file generation.""")
p.add_option('--unattended-install', action='store_true',
help="""Specify 'unattended_install' for the installer item.""")
p.add_option('--catalog', default=[], action='append',
help="""Specify target catalogs.""")
p.add_option('--min-os-ver', default=None, metavar='VERSION',
help="""Minimum OS version for the installer item.""")
p.add_option('--max-os-ver', default=None, metavar='VERSION',
help="""Maximum OS version for the installer item.""")
p.add_option('--makepkginfo-options', default=None, metavar='"OPTIONS"',
help="""OPTIONS will be passed to 'makepkginfo' for pkginfo file generation.
Example: --makepkginfo-options=\"-c production --unattended_install --description='A good description'\"""")
p.add_option('--version', '-V', action='store_true',
help='Print the version of the munki tools and exit.')
p.add_option('--verbose', '-v', action='store_true',
@@ -602,6 +596,7 @@ def main():
cleanupAndExit(-1)
# generate pkginfo for the item
# use '--makepkginfo_options' if specified
makepkginfo_options=[]
if options.makepkginfo_options:
makepkginfo_options = shlex.split(options.makepkginfo_options)