From ad62bd2619d60753a669bd8cd1581fb9da35d535 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 6 Oct 2006 00:54:49 +0000 Subject: [PATCH] For bug #150178, print an error message when emerge is called with both --config and --pretend. svn path=/main/trunk/; revision=4600 --- bin/emerge | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/emerge b/bin/emerge index d2d3e768e..6192ca36c 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4126,6 +4126,10 @@ def emerge_main(): action_regen(settings, portdb) # HELP action elif "config"==myaction: + if "--pretend" in myopts: + sys.stderr.write("emerge: The --config action " + \ + "does not support --pretend.\n") + return 1 validate_ebuild_environment(trees) action_config(settings, trees, myopts, myfiles) @@ -4161,4 +4165,5 @@ def emerge_main(): post_emerge(settings, mtimedb, 0) if __name__ == "__main__": - emerge_main() + retval = emerge_main() + sys.exit(retval) -- 2.26.2