repoman: support REPOMAN_DEFAULT_OPTS variable

1 files changed, 9 insertions, 0 deletions

diff --git a/bin/repoman b/bin/repoman
index 38f969464..65c1f40fd 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -218,6 +218,10 @@ def ParseArgs(argv, qahelp):
 	parser.add_option('-i', '--ignore-arches', dest='ignore_arches', action='store_true',
 		default=False, help='ignore arch-specific failures (where arch != host)')
 
+	parser.add_option("--ignore-default-opts",
+		action="store_true",
+		help="do not use the REPOMAN_DEFAULT_OPTS environment variable")
+
 	parser.add_option('-I', '--ignore-masked', dest='ignore_masked', action='store_true',
 		default=False, help='ignore masked packages (not allowed with commit mode)')
 
@@ -247,6 +251,11 @@ def ParseArgs(argv, qahelp):
 
 	opts, args = parser.parse_args(argv[1:])
 
+	if not opts.ignore_default_opts:
+		default_opts = repoman_settings.get("REPOMAN_DEFAULT_OPTS", "").split()
+		if default_opts:
+			opts, args = parser.parse_args(default_opts + sys.argv[1:])
+
 	if opts.mode == 'help':
 		parser.print_help(short=False)