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

Merge branch 'cli' of https://code.google.com/r/davvid-munki-cli

Browse Source
This commit is contained in:
Greg Neagle
2012-02-29 10:24:28 -08:00
parent 7c910a1180 3510b3b994
commit 00e0407d6e
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/client/munkiimport
View File

@@ -521,10 +521,16 @@ 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('--unattended-install', action='store_true',
help="""Specify 'unattended_install' for the installer item.""")
p.add_option('--catalog', default=[], action='append',
help="""Specify target catalogs. (default: prompt)""")
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('--version', '-V', action='store_true',
help='Print the version of the munki tools and exit.')
help='Print the version of the munki tools and exit.')
p.add_option('--verbose', '-v', action='store_true',
help='Print more output.')
@@ -704,7 +710,17 @@ def main():
except RepoCopyError, errmsg:
print >> sys.stderr, errmsg
cleanupAndExit(-1)
if options.unattended_install:
pkginfo['unattended_install'] = True
# default OS versions
if options.min_os_ver:
pkginfo['minimum_os_version'] = options.min_os_ver
if options.max_os_ver:
pkginfo['maximum_os_version'] = options.max_os_ver
# adjust the installer_item_location to match the actual location and name
pkginfo['installer_item_location'] = uploaded_pkgpath