From 3349335fa7f3915c34abfbd80c5233cfdb480150 Mon Sep 17 00:00:00 2001
From: Heig Gregorian <hgregorian@attinteractive.com>
Date: Tue, 1 May 2012 11:36:30 -0700
Subject: [PATCH] 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.
---
 code/client/munkiimport | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/client/munkiimport b/code/client/munkiimport
index 3746e56c..fb7394e8 100755
--- a/code/client/munkiimport
+++ b/code/client/munkiimport
@@ -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)