| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-24 20:40:11 +0000 (Thu, 24 Apr 2008) |
| 3 |
New Revision: 9963 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Rename the "consistent" depgraph parameter to "complete" since what it |
| 9 |
really means is that the graph will be complete in the sense that no |
| 10 |
known dependencies are neglected. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-24 18:00:13 UTC (rev 9962) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-24 20:40:11 UTC (rev 9963) |
| 17 |
@@ -382,7 +382,7 @@ |
| 18 |
if "--deep" in myopts: |
| 19 |
myparams.add("deep") |
| 20 |
if "--complete-graph" in myopts: |
| 21 |
- myparams.add("consistent") |
| 22 |
+ myparams.add("complete") |
| 23 |
return myparams |
| 24 |
|
| 25 |
# search functionality |
| 26 |
@@ -1860,7 +1860,7 @@ |
| 27 |
nodeps = "--nodeps" in self.myopts |
| 28 |
empty = "empty" in self.myparams |
| 29 |
deep = "deep" in self.myparams |
| 30 |
- consistent = "consistent" in self.myparams |
| 31 |
+ complete = "complete" in self.myparams |
| 32 |
update = "--update" in self.myopts and dep.depth <= 1 |
| 33 |
if dep.blocker: |
| 34 |
if not buildpkgonly and \ |
| 35 |
@@ -1904,7 +1904,7 @@ |
| 36 |
# should have been masked. |
| 37 |
raise |
| 38 |
if not myarg: |
| 39 |
- if consistent: |
| 40 |
+ if complete: |
| 41 |
self._ignored_deps.append(dep) |
| 42 |
return 1 |
| 43 |
|
| 44 |
@@ -2052,7 +2052,7 @@ |
| 45 |
return 1 |
| 46 |
elif pkg.installed and \ |
| 47 |
"deep" not in self.myparams: |
| 48 |
- if "consistent" not in self.myparams: |
| 49 |
+ if "complete" not in self.myparams: |
| 50 |
return 1 |
| 51 |
dep_stack = self._ignored_deps |
| 52 |
|
| 53 |
@@ -2942,7 +2942,7 @@ |
| 54 |
Since this method can consume enough time to disturb users, it is |
| 55 |
currently only enabled by the --complete-graph option. |
| 56 |
""" |
| 57 |
- if "consistent" not in self.myparams: |
| 58 |
+ if "complete" not in self.myparams: |
| 59 |
# Skip this to avoid consuming enough time to disturb users. |
| 60 |
return 1 |
| 61 |
|
| 62 |
|
| 63 |
-- |
| 64 |
gentoo-commits@l.g.o mailing list |
Archives