diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:27:09 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:27:09 +0000 |
commit | 460b83c312ee9dc3e78ebc19caf7216fb99b6480 (patch) | |
tree | 19b240d08d4fff4b99e975e0ea67f73b4dd070d5 | |
parent | d971ee9ebb0df596d00d62d1157be92180f914fb (diff) | |
download | portage-460b83c312ee9dc3e78ebc19caf7216fb99b6480.tar.gz portage-460b83c312ee9dc3e78ebc19caf7216fb99b6480.tar.bz2 portage-460b83c312ee9dc3e78ebc19caf7216fb99b6480.zip |
Make --nodepa automatically disable --tree.
svn path=/main/trunk/; revision=10121
-rw-r--r-- | pym/_emerge/__init__.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index f2f95f841..1e258ec72 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7582,7 +7582,13 @@ def action_build(settings, trees, mtimedb, pretend = "--pretend" in myopts fetchonly = "--fetchonly" in myopts or "--fetch-all-uri" in myopts ask = "--ask" in myopts + nodeps = "--nodeps" in myopts tree = "--tree" in myopts + if nodeps and tree: + tree = False + del myopts["--tree"] + portage.writemsg(colorize("WARN", " * ") + \ + "--tree is broken with --nodeps. Disabling...\n") verbose = "--verbose" in myopts quiet = "--quiet" in myopts if pretend or fetchonly: @@ -7660,6 +7666,24 @@ def action_build(settings, trees, mtimedb, for opt in ("--skipfirst", "--ask", "--tree"): resume_opts.pop(opt, None) myopts.update(resume_opts) + + buildpkgonly = "--buildpkgonly" in myopts + pretend = "--pretend" in myopts + fetchonly = "--fetchonly" in myopts or "--fetch-all-uri" in myopts + ask = "--ask" in myopts + nodeps = "--nodeps" in myopts + tree = "--tree" in myopts + if nodeps and tree: + tree = False + del myopts["--tree"] + portage.writemsg(colorize("WARN", " * ") + \ + "--tree is broken with --nodeps. Disabling...\n") + verbose = "--verbose" in myopts + quiet = "--quiet" in myopts + if pretend or fetchonly: + # make the mtimedb readonly + mtimedb.filename = None + if show_spinner: print "Calculating dependencies ", myparams = create_depgraph_params(myopts, myaction) |