mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-12 10:10:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added a '--verify-options-only' option to makepkginfo. Munkiimport makes use of this new option to derive installer_item. The overall result is that now, the /path/to/installer_item may be anywhere in the options string, however only the first /path/to/installer_item will be used.

Browse Source 
def makePkgInfo can be passed an 'item_path' of "None" in order to
invoke the testing mode and its interpretation of various exit codes
including the presumed /path/to/installer_item and ignoring any
additional installer_items specified.
This commit is contained in:
Heig Gregorian
2012-05-07 13:35:22 -07:00
parent 6a7de46245
commit 6dbbe4c047
2 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/client/makepkginfo
View File

@@ -278,6 +278,7 @@ def main():
usage = """usage: %prog [options] [/path/to/installeritem]
%prog --help for more information."""
p = optparse.OptionParser(usage=usage)
p.add_option('--verify-options-only', action="store_true", help=optparse.SUPPRESS_HELP)
p.add_option('--file', '-f', action="append",
help='''Path to a filesystem item installed by this
package, typically an application. This generates an
@@ -516,6 +517,14 @@ def main():
print >> sys.stderr, 'Ignoring additional installer items:'
print >> sys.stderr, '\t', '\n\t'.join(arguments[1:])
if options.verify_options_only:
if arguments:
print >> sys.stderr, 'Using installer item: %s' % arguments[0].rstrip("/")
print >> sys.stdout, arguments[0].rstrip("/")
if len(arguments) > 1:
exit(254)
exit(0)
if options.installer_choices_xml:
os_version = munkicommon.getOsVersion(only_major_minor=False,as_tuple=True)
if os_version < (10, 6, 6):

78
code/client/munkiimport
View File

@@ -419,27 +419,48 @@ def findMatchingPkginfo(pkginfo):
def makePkgInfo(item_path,options=None):
"""Calls makepkginfo to generate the pkginfo for item_path."""
test_mode = False
if not item_path:
test_mode = True
# first look for a makepkginfo in the same dir as us
mydir = os.path.dirname(os.path.abspath(__file__))
makepkginfo_path = os.path.join(mydir, 'makepkginfo')
if not os.path.exists(makepkginfo_path):
# didn't find it; assume the default install path
makepkginfo_path = '/usr/local/munki/makepkginfo'
if options:
cmd = [makepkginfo_path] + options + [item_path]
else:
cmd = [makepkginfo_path, item_path]
# build makepkginfo command depending combination of:
# Are we in a 'testing mode?'
# Were options provided?
if test_mode and options:
cmd = [makepkginfo_path] + options + ['--verify-options-only']
elif test_mode and not options:
cmd = [makepkginfo_path] + ['--verify-options-only']
elif not test_mode and options:
cmd = [makepkginfo_path] + [item_path] + options
elif not test_mode and not options:
cmd = [makepkginfo_path] + [item_path]
proc = subprocess.Popen(cmd,
bufsize=-1, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(pliststr, err) = proc.communicate()
(stdout, stderr) = proc.communicate()
if test_mode:
if proc.returncode:
if proc.returncode == 254:
return stdout.rstrip('\n')
elif proc.returncode == 2:
for line in stderr.split('\n'):
if 'error' in line:
print >> sys.stderr, line
exit(-1)
else:
return {}
else:
return stdout.rstrip('\n')
if proc.returncode:
# print >> sys.stderr, err
for line in err.split('\n'):
if 'error' in line:
print >> sys.stderr, line
print >> sys.stderr, stderr
return {}
return FoundationPlist.readPlistFromString(pliststr)
return FoundationPlist.readPlistFromString(stdout)
def makeCatalogs():
@@ -575,13 +596,19 @@ def main():
p.print_usage()
exit(0)
# The target '/path/to/installer_item' should be the last item
installer_item = arguments[-1]
# Verify that arguments, presumed to be for
# 'makepkginfo' are valid and derive installer_item
installer_item = makePkgInfo(None,arguments)
if not installer_item:
# no valid installer_item was returned from 'makepkginfo'
# print >> sys.stderr, 'makepkginfo options failed verification.'
# print >> sys.stderr, 'No installer_item was specified.'
print >> sys.stderr, 'No installer item was provided.'
cleanupAndExit(-1)
item_ext = os.path.splitext(installer_item)[1]
if item_ext not in ['.pkg', '.mpkg', '.dmg', '.app']:
print >> sys.stderr, 'Unknown installer item type: "%s"' % installer_item
print >> sys.stderr, 'Ensure that "/path/to/installer_item" is specified last.'
exit(-1)
if not os.path.exists(installer_item):
@@ -608,19 +635,32 @@ def main():
# we need to convert to dmg
dmg_path = makeDMG(installer_item)
if dmg_path:
option_removal_item = installer_item
installer_item = dmg_path
else:
print >> sys.stderr, ('Could not convert %s to a disk image.'
% installer_item)
cleanupAndExit(-1)
# collect 'makepkginfo' options from the remainder of 'arguments' (if any)
makepkginfo_options=[]
if len(arguments) > 1:
makepkginfo_options = arguments[0:-1]
# generate pkginfo for the item
pkginfo = makePkgInfo(installer_item,makepkginfo_options)
# Since 'arguments' have been validated by 'makepkginfo',
# store them as 'makepkginfo_options'
makepkginfo_options = arguments
# Attempt to clean-up makepkginfo_options by
# removing installer_item from the arguments
try:
option_removal_item
except NameError:
option_removal_item = installer_item
try:
makepkginfo_options.remove(option_removal_item)
except:
try:
makepkginfo_options.remove(option_removal_item + '/')
except:
pass
pkginfo = makePkgInfo(installer_item,makepkginfo_options)
if not pkginfo:
# makepkginfo returned an error
print >> sys.stderr, 'Getting package info failed.'