1 |
Author: zmedico |
2 |
Date: 2008-05-03 03:27:09 +0000 (Sat, 03 May 2008) |
3 |
New Revision: 10121 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Make --nodepa automatically disable --tree. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-03 02:57:06 UTC (rev 10120) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-03 03:27:09 UTC (rev 10121) |
15 |
@@ -7582,7 +7582,13 @@ |
16 |
pretend = "--pretend" in myopts |
17 |
fetchonly = "--fetchonly" in myopts or "--fetch-all-uri" in myopts |
18 |
ask = "--ask" in myopts |
19 |
+ nodeps = "--nodeps" in myopts |
20 |
tree = "--tree" in myopts |
21 |
+ if nodeps and tree: |
22 |
+ tree = False |
23 |
+ del myopts["--tree"] |
24 |
+ portage.writemsg(colorize("WARN", " * ") + \ |
25 |
+ "--tree is broken with --nodeps. Disabling...\n") |
26 |
verbose = "--verbose" in myopts |
27 |
quiet = "--quiet" in myopts |
28 |
if pretend or fetchonly: |
29 |
@@ -7660,6 +7666,24 @@ |
30 |
for opt in ("--skipfirst", "--ask", "--tree"): |
31 |
resume_opts.pop(opt, None) |
32 |
myopts.update(resume_opts) |
33 |
+ |
34 |
+ buildpkgonly = "--buildpkgonly" in myopts |
35 |
+ pretend = "--pretend" in myopts |
36 |
+ fetchonly = "--fetchonly" in myopts or "--fetch-all-uri" in myopts |
37 |
+ ask = "--ask" in myopts |
38 |
+ nodeps = "--nodeps" in myopts |
39 |
+ tree = "--tree" in myopts |
40 |
+ if nodeps and tree: |
41 |
+ tree = False |
42 |
+ del myopts["--tree"] |
43 |
+ portage.writemsg(colorize("WARN", " * ") + \ |
44 |
+ "--tree is broken with --nodeps. Disabling...\n") |
45 |
+ verbose = "--verbose" in myopts |
46 |
+ quiet = "--quiet" in myopts |
47 |
+ if pretend or fetchonly: |
48 |
+ # make the mtimedb readonly |
49 |
+ mtimedb.filename = None |
50 |
+ |
51 |
if show_spinner: |
52 |
print "Calculating dependencies ", |
53 |
myparams = create_depgraph_params(myopts, myaction) |
54 |
|
55 |
-- |
56 |
gentoo-commits@l.g.o mailing list |