Removed --installxml, --uninstallxml and --serialnumber options from makepkginfo since we're no longer supporting CS5 installs that aren't processed with AAMEE.

git-svn-id: http://munki.googlecode.com/svn/trunk@614 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-07-28 23:57:34 +00:00
parent f7595cb979
commit 03cd5fd55c
-33
View File
@@ -340,24 +340,6 @@ def main():
Adobe CS3 deployment package, UNINSTALLERDMG is a path
to a disk image containing an AdobeUberUninstaller for
this item.''')
p.add_option('--installxml',
help='''Optional flag.
If the installer item is a disk image containing an
Adobe CS5 product, INSTALLXML specifies the path to
an install.xml file containing installation data.''')
p.add_option('--uninstallxml',
help='''Optional flag.
If the installer item is a disk image containing an
Adobe CS5 product, UNINSTALLXML specifies the path to
an uninstall.xml containing uninstall data.''')
p.add_option('--serialnumber',
help='''Optional flag.
If the installer item is a disk image containing an
Adobe CS5 product, SERIALNUMBER is the product
serial number.''')
p.add_option('--catalog', '-c', action="append",
help='''Optional flag.
@@ -554,21 +536,6 @@ def main():
if installs:
catinfo['installs'] = installs
if options.installxml or options.uninstallxml or \
options.serialnumber:
more_info = adobeutils.getAdobeInstallInfo(
mountpoint=None,
installxmlpath=options.installxml,
uninstallxmlpath=options.uninstallxml,
serialnumber=options.serialnumber,
suppressRegistration=True,
suppressUpdates=True)
if not 'adobe_install_info' in catinfo:
catinfo['adobe_install_info'] = {}
for key in more_info.keys():
catinfo['adobe_install_info'][key] = more_info[key]
# and now, what we've all been waiting for...
print FoundationPlist.writePlistToString(catinfo)