diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:28:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:28:06 +0000 |
| commit | 2a4e6cb48ea4aca704aea15c11afd624b2294a4e (patch) | |
| tree | e945522c69f237fe76f6781b91d97cae5a5e4db9 | |
| parent | d4674159a5f8f0caece71a73750809e707bec69b (diff) | |
| download | portage-2a4e6cb48ea4aca704aea15c11afd624b2294a4e.tar.gz portage-2a4e6cb48ea4aca704aea15c11afd624b2294a4e.tar.bz2 portage-2a4e6cb48ea4aca704aea15c11afd624b2294a4e.zip | |
Make --nodeps automatically disable --tree. (trunk r10121)
svn path=/main/branches/2.1.2/; revision=10122
| -rwxr-xr-x | bin/emerge | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index b875862f7..117a7a0fd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -7592,7 +7592,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: @@ -7670,6 +7676,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) |