For bug #150178, print an error message when emerge is called with both --config...

svn path=/main/trunk/; revision=4600

diff --git a/bin/emerge b/bin/emerge
index d2d3e768e78a298ab6b88497f796dc1957a40d5e..6192ca36c83029423ee428630f422e38a48b8889 100755 (executable)
--- 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)