diff options
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index e4449e80..5f0a7663 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -398,6 +398,7 @@ def insert_optional_args(args): '--getbinpkgonly' : ('n',), '--jobs' : valid_integers, '--keep-going' : ('n',), + '--package-moves' : ('n',), '--rebuilt-binaries' : ('n',), '--root-deps' : ('rdeps',), '--select' : ('n',), @@ -638,6 +639,12 @@ def parse_opts(tmpcmdline, silent=False): "choices" : ("True", "n") }, + "--package-moves": { + "help" : "perform package moves when necessary", + "type" : "choice", + "choices" : ("True", "n") + }, + "--rebuilt-binaries": { "help" : "replace installed packages with binary " + \ "packages that have been rebuilt", @@ -791,6 +798,9 @@ def parse_opts(tmpcmdline, silent=False): else: myoptions.keep_going = None + if myoptions.package_moves in ("True",): + myoptions.package_moves = True + if myoptions.rebuilt_binaries in ("True",): myoptions.rebuilt_binaries = True @@ -1247,7 +1257,14 @@ def emerge_main(): if rval != os.EX_OK: return rval + tmpcmdline = [] + if "--ignore-default-opts" not in myopts: + tmpcmdline.extend(settings["EMERGE_DEFAULT_OPTS"].split()) + tmpcmdline.extend(sys.argv[1:]) + myaction, myopts, myfiles = parse_opts(tmpcmdline) + if myaction not in ('help', 'info', 'version') and \ + myopts.get('--package-moves') != 'n' and \ _global_updates(trees, mtimedb["updates"]): mtimedb.commit() # Reload the whole config from scratch. @@ -1258,12 +1275,6 @@ def emerge_main(): if xterm_titles: xtermTitle("emerge") - tmpcmdline = [] - if "--ignore-default-opts" not in myopts: - tmpcmdline.extend(settings["EMERGE_DEFAULT_OPTS"].split()) - tmpcmdline.extend(sys.argv[1:]) - myaction, myopts, myfiles = parse_opts(tmpcmdline) - if "--digest" in myopts: os.environ["FEATURES"] = os.environ.get("FEATURES","") + " digest" # Reload the whole config from scratch so that the portdbapi internal |