almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

- Add ability to define destdir on the cli to override conf file

Browse Source 
- Clean up optionparse stuff, print usage if arg list is too small
This commit is contained in:
jkeating@localhost.localdomain 2007-02-12 17:51:36 -05:00 committed by Jesse Keating
parent a8e2603055
commit ec8b2ead8f
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -1,6 +1,8 @@
* Mon Feb 12 2007 Jesse Keating <jkeating@redhat.com> * Mon Feb 12 2007 Jesse Keating <jkeating@redhat.com>
- Add new Make targets (Essien Ita Essien) - Add new Make targets (Essien Ita Essien)
- Add runtime flags for doing specific stages of the compose (Essien Ita Essien) - Add runtime flags for doing specific stages of the compose (Essien Ita Essien)
- Add ability to define destdir on the cli to override conf file
- Clean up optionparse stuff, print usage if arg list is too small
* Thu Feb 08 2007 Jesse Keating <jkeating@redhat.com> * Thu Feb 08 2007 Jesse Keating <jkeating@redhat.com>
- Add support for globbing in manifest - Add support for globbing in manifest

43
pungi
View File

@ -70,6 +70,9 @@ def main():
pkglist = get_packagelist(config.get('default', 'manifest')) pkglist = get_packagelist(config.get('default', 'manifest'))
if not opts.destdir == "*CONFFILE*":
config.set('default', 'destdir', opts.destdir)
destdir = config.get('default', 'destdir') destdir = config.get('default', 'destdir')
if not os.path.exists(destdir): if not os.path.exists(destdir):
@ -121,11 +124,11 @@ def main():
config.get('default', 'version'), config.get('default', 'version'),
config.get('default', 'flavor'), config.get('default', 'flavor'),
'source', 'SRPM') 'source', 'SRPM')
if opts.do_all or opts.do_splittree: if opts.do_all or opts.do_splittree:
mypungi.doSplitSRPMs() mypungi.doSplitSRPMs()
if opts.do_all or opts.do_createiso: if opts.do_all or opts.do_createiso:
mypungi.doCreateIsos() mypungi.doCreateIsos()
if __name__ == '__main__': if __name__ == '__main__':
from optparse import OptionParser from optparse import OptionParser
@ -133,27 +136,31 @@ if __name__ == '__main__':
def get_arguments(): def get_arguments():
# hack job for now, I'm sure this could be better for our uses # hack job for now, I'm sure this could be better for our uses
usage = "usage: %s [options]" % sys.argv[0] parser = OptionParser()
parser = OptionParser(usage=usage) parser.add_option("--destdir", default="*CONFFILE*", dest="destdir",
# parser.add_option("--destdir", default=".", dest="destdir", help='destination directory (defaults to current directory)')
# help='destination directory (defaults to current directory)')
parser.add_option("-c", "--conf", default='/etc/pungi/pungi.conf', dest="config", parser.add_option("-c", "--conf", default='/etc/pungi/pungi.conf', dest="config",
help='Config file to use') help='Config file to use')
parser.add_option("--all-stages", action="store_true", default=True, dest="do_all",
parser.add_option("--all-stages", action="store_true", default=True, dest="do_all", help="Enable ALL stages") help="Enable ALL stages")
parser.add_option("-B", action="store_true", default=False, dest="do_buildinstall", help="Flag to enable processing the BuildInstall stage") parser.add_option("-B", action="store_true", default=False, dest="do_buildinstall",
parser.add_option("-G", action="store_true", default=False, dest="do_gather", help="Flag to enable processing the Gather stage") help="Flag to enable processing the BuildInstall stage")
parser.add_option("-P", action="store_true", default=False, dest="do_packageorder", help="Flag to enable processing the Package Order stage") parser.add_option("-G", action="store_true", default=False, dest="do_gather",
parser.add_option("-S", action="store_true", default=False, dest="do_splittree", help="Flag to enable processing the SplitTree stage") help="Flag to enable processing the Gather stage")
parser.add_option("-I", action="store_true", default=False, dest="do_createiso", help="Flag to enable processing the CreateISO stage") parser.add_option("-P", action="store_true", default=False, dest="do_packageorder",
help="Flag to enable processing the Package Order stage")
parser.add_option("-S", action="store_true", default=False, dest="do_splittree",
help="Flag to enable processing the SplitTree stage")
parser.add_option("-I", action="store_true", default=False, dest="do_createiso",
help="Flag to enable processing the CreateISO stage")
(opts, args) = parser.parse_args() (opts, args) = parser.parse_args()
if opts.do_gather or opts.do_buildinstall or opts.do_packageorder or opts.do_splittree or opts.do_createiso: if opts.do_gather or opts.do_buildinstall or opts.do_packageorder or opts.do_splittree or opts.do_createiso:
opts.do_all = False opts.do_all = False
#if len(opts) < 1: if len(sys.argv) < 2:
# parser.print_help() parser.print_help()
# sys.exit(0) sys.exit(0)
return (opts, args) return (opts, args)
def get_packagelist(manifest): def get_packagelist(manifest):