| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-25 06:24:33 +0000 (Thu, 25 Jun 2009) |
| 3 |
New Revision: 13692 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/Package.py |
| 7 |
main/trunk/pym/_emerge/Scheduler.py |
| 8 |
main/trunk/pym/_emerge/depgraph.py |
| 9 |
Log: |
| 10 |
Add a Package.metadata.properties attribute containing a list of enabled |
| 11 |
PROPERTIES values. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/Package.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/Package.py 2009-06-25 06:06:14 UTC (rev 13691) |
| 17 |
+++ main/trunk/pym/_emerge/Package.py 2009-06-25 06:24:33 UTC (rev 13692) |
| 18 |
@@ -237,3 +237,7 @@ |
| 19 |
except ValueError: |
| 20 |
v = 0 |
| 21 |
self._pkg.mtime = v |
| 22 |
+ |
| 23 |
+ @property |
| 24 |
+ def properties(self): |
| 25 |
+ return self['PROPERTIES'].split() |
| 26 |
|
| 27 |
Modified: main/trunk/pym/_emerge/Scheduler.py |
| 28 |
=================================================================== |
| 29 |
--- main/trunk/pym/_emerge/Scheduler.py 2009-06-25 06:06:14 UTC (rev 13691) |
| 30 |
+++ main/trunk/pym/_emerge/Scheduler.py 2009-06-25 06:24:33 UTC (rev 13692) |
| 31 |
@@ -328,14 +328,7 @@ |
| 32 |
if not (isinstance(task, Package) and \ |
| 33 |
task.operation == "merge"): |
| 34 |
continue |
| 35 |
- try: |
| 36 |
- properties = flatten(use_reduce(paren_reduce( |
| 37 |
- task.metadata["PROPERTIES"]), uselist=task.use.enabled)) |
| 38 |
- except portage.exception.InvalidDependString, e: |
| 39 |
- show_invalid_depstring_notice(task, |
| 40 |
- task.metadata["PROPERTIES"], str(e)) |
| 41 |
- raise self._unknown_internal_error() |
| 42 |
- if "interactive" in properties: |
| 43 |
+ if 'interactive' in task.metadata.properties: |
| 44 |
interactive_tasks.append(task) |
| 45 |
return interactive_tasks |
| 46 |
|
| 47 |
|
| 48 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 49 |
=================================================================== |
| 50 |
--- main/trunk/pym/_emerge/depgraph.py 2009-06-25 06:06:14 UTC (rev 13691) |
| 51 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-06-25 06:24:33 UTC (rev 13692) |
| 52 |
@@ -4007,18 +4007,8 @@ |
| 53 |
else: |
| 54 |
return colorize("PKG_NOMERGE", pkg_str) |
| 55 |
|
| 56 |
- try: |
| 57 |
- properties = flatten(use_reduce(paren_reduce( |
| 58 |
- pkg.metadata["PROPERTIES"]), uselist=pkg.use.enabled)) |
| 59 |
- except portage.exception.InvalidDependString, e: |
| 60 |
- if not pkg.installed: |
| 61 |
- show_invalid_depstring_notice(pkg, |
| 62 |
- pkg.metadata["PROPERTIES"], str(e)) |
| 63 |
- del e |
| 64 |
- return 1 |
| 65 |
- properties = [] |
| 66 |
- interactive = "interactive" in properties |
| 67 |
- if interactive and pkg.operation == "merge": |
| 68 |
+ if 'interactive' in pkg.metadata.properties and \ |
| 69 |
+ pkg.operation == 'merge': |
| 70 |
addl = colorize("WARN", "I") + addl[1:] |
| 71 |
if ordered: |
| 72 |
counters.interactive += 1 |
Archives