summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-06 00:54:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-06 00:54:49 +0000
commitad62bd2619d60753a669bd8cd1581fb9da35d535 (patch)
treee5b17a46dfed1a899b5b6f1ca40d66a0b815c69b
parent63ae5cb57e4a581e4ed5d9e984f303cb112d9d3c (diff)
downloadportage-ad62bd2619d60753a669bd8cd1581fb9da35d535.tar.gz
portage-ad62bd2619d60753a669bd8cd1581fb9da35d535.tar.bz2
portage-ad62bd2619d60753a669bd8cd1581fb9da35d535.zip
For bug #150178, print an error message when emerge is called with both --config and --pretend.
svn path=/main/trunk/; revision=4600
-rwxr-xr-xbin/emerge7
1 files changed, 6 insertions, 1 deletions
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)