diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-12-25 06:04:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-25 06:04:03 +0000 |
| commit | f19d539f821e32b5433cb9961e2ee3d961ed0eb0 (patch) | |
| tree | 8b312413901072c7efcf3adcb227716a18b2ab8d /bin/emerge | |
| parent | Drop the warning messages for users that aren't in the portage group since tp... (diff) | |
| download | portage-multirepo-f19d539f821e32b5433cb9961e2ee3d961ed0eb0.tar.gz portage-multirepo-f19d539f821e32b5433cb9961e2ee3d961ed0eb0.tar.bz2 portage-multirepo-f19d539f821e32b5433cb9961e2ee3d961ed0eb0.zip | |
Prevent the regen action from running in --pretend mode.
svn path=/main/trunk/; revision=5388
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -5018,23 +5018,20 @@ def emerge_main(): xtermTitleReset() portage.atexit_register(emergeexit) - if myaction in ["sync","metadata"] and "--help" not in myopts: + if myaction in ("config", "metadata", "regen", "sync"): if "--pretend" in myopts: - print "emerge: \"sync\" actions do not support \"--pretend.\"" - sys.exit(1) - if "sync" == myaction: - action_sync(settings, trees, mtimedb, myopts, myaction) - else: - action_metadata(settings, portdb, myopts) + sys.stderr.write(("emerge: The '%s' action does " + \ + "not support '--pretend'.\n") % myaction) + return 1 + if "sync" == myaction: + action_sync(settings, trees, mtimedb, myopts, myaction) + elif "metadata" == myaction: + action_metadata(settings, portdb, myopts) elif myaction=="regen": validate_ebuild_environment(trees) 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) |