| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-23 20:38:40 +0000 (Tue, 23 Jun 2009) |
| 3 |
New Revision: 13676 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/Scheduler.py |
| 7 |
main/trunk/pym/_emerge/depgraph.py |
| 8 |
Log: |
| 9 |
Bu #275217 - Part 1 - Resolve the circular dep between Scheduler and |
| 10 |
depgraph; mark all functions as local that aren't used outside of depgraph. |
| 11 |
Thanks to Sebastian Mingramm (few) <s.mingramm@×××.de> for this patch. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/Scheduler.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/Scheduler.py 2009-06-23 20:11:24 UTC (rev 13675) |
| 17 |
+++ main/trunk/pym/_emerge/Scheduler.py 2009-06-23 20:38:40 UTC (rev 13676) |
| 18 |
@@ -27,6 +27,7 @@ |
| 19 |
from _emerge.create_depgraph_params import create_depgraph_params |
| 20 |
from _emerge.create_world_atom import create_world_atom |
| 21 |
from _emerge.DepPriority import DepPriority |
| 22 |
+from _emerge.depgraph import depgraph |
| 23 |
from _emerge.EbuildFetcher import EbuildFetcher |
| 24 |
from _emerge.EbuildPhase import EbuildPhase |
| 25 |
from _emerge.emergelog import emergelog, _emerge_log_dir |
| 26 |
@@ -42,12 +43,6 @@ |
| 27 |
from _emerge.SequentialTaskQueue import SequentialTaskQueue |
| 28 |
from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice |
| 29 |
|
| 30 |
-import portage.proxy.lazyimport |
| 31 |
-import portage.proxy as proxy |
| 32 |
-proxy.lazyimport.lazyimport(globals(), |
| 33 |
- '_emerge.depgraph:depgraph', |
| 34 |
-) |
| 35 |
- |
| 36 |
class Scheduler(PollScheduler): |
| 37 |
|
| 38 |
_opts_ignore_blockers = \ |
| 39 |
|
| 40 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 41 |
=================================================================== |
| 42 |
--- main/trunk/pym/_emerge/depgraph.py 2009-06-23 20:11:24 UTC (rev 13675) |
| 43 |
+++ main/trunk/pym/_emerge/depgraph.py 2009-06-23 20:38:40 UTC (rev 13676) |
| 44 |
@@ -47,12 +47,6 @@ |
| 45 |
from _emerge.UnmergeDepPriority import UnmergeDepPriority |
| 46 |
from _emerge.visible import visible |
| 47 |
|
| 48 |
-import portage.proxy.lazyimport |
| 49 |
-import portage.proxy as proxy |
| 50 |
-proxy.lazyimport.lazyimport(globals(), |
| 51 |
- '_emerge.Scheduler:Scheduler', |
| 52 |
-) |
| 53 |
-#from _emerge.Scheduler import Scheduler |
| 54 |
class depgraph(object): |
| 55 |
|
| 56 |
pkg_tree_map = RootConfig.pkg_tree_map |
| 57 |
@@ -69,7 +63,8 @@ |
| 58 |
self.edebug = 1 |
| 59 |
self.spinner = spinner |
| 60 |
self._running_root = trees["/"]["root_config"] |
| 61 |
- self._opts_no_restart = Scheduler._opts_no_restart |
| 62 |
+ self._opts_no_restart = frozenset(["--buildpkgonly", |
| 63 |
+ "--fetchonly", "--fetch-all-uri", "--pretend"]) |
| 64 |
self.pkgsettings = {} |
| 65 |
# Maps slot atom to package for each Package added to the graph. |
| 66 |
self._slot_pkg_map = {} |
| 67 |
@@ -2235,7 +2230,7 @@ |
| 68 |
self._pkg_cache[pkg] = pkg |
| 69 |
return pkg |
| 70 |
|
| 71 |
- def validate_blockers(self): |
| 72 |
+ def _validate_blockers(self): |
| 73 |
"""Remove any blockers from the digraph that do not match any of the |
| 74 |
packages within the graph. If necessary, create hard deps to ensure |
| 75 |
correct merge order such that mutually blocking packages are never |
| 76 |
@@ -2625,7 +2620,7 @@ |
| 77 |
if not self._complete_graph(): |
| 78 |
raise self._unknown_internal_error() |
| 79 |
|
| 80 |
- if not self.validate_blockers(): |
| 81 |
+ if not self._validate_blockers(): |
| 82 |
raise self._unknown_internal_error() |
| 83 |
|
| 84 |
if self._slot_collision_info: |
| 85 |
@@ -3772,7 +3767,7 @@ |
| 86 |
if "--changelog" in self.myopts: |
| 87 |
inst_matches = vardb.match(pkg.slot_atom) |
| 88 |
if inst_matches: |
| 89 |
- changelogs.extend(self.calc_changelog( |
| 90 |
+ changelogs.extend(self._calc_changelog( |
| 91 |
portdb.findname(pkg_key), |
| 92 |
inst_matches[0], pkg_key)) |
| 93 |
else: |
| 94 |
@@ -4267,7 +4262,7 @@ |
| 95 |
show_mask_docs() |
| 96 |
print |
| 97 |
|
| 98 |
- def calc_changelog(self,ebuildpath,current,next): |
| 99 |
+ def _calc_changelog(self,ebuildpath,current,next): |
| 100 |
if ebuildpath == None or not os.path.exists(ebuildpath): |
| 101 |
return [] |
| 102 |
current = '-'.join(portage.catpkgsplit(current)[1:]) |
| 103 |
@@ -4301,7 +4296,7 @@ |
| 104 |
return [] |
| 105 |
return divisions |
| 106 |
|
| 107 |
- def find_changelog_tags(self,changelog): |
| 108 |
+ def _find_changelog_tags(self,changelog): |
| 109 |
divs = [] |
| 110 |
release = None |
| 111 |
while 1: |
| 112 |
@@ -4376,7 +4371,7 @@ |
| 113 |
if world_locked: |
| 114 |
world_set.unlock() |
| 115 |
|
| 116 |
- def loadResumeCommand(self, resume_data, skip_masked=True, |
| 117 |
+ def _loadResumeCommand(self, resume_data, skip_masked=True, |
| 118 |
skip_missing=True): |
| 119 |
""" |
| 120 |
Add a resume command to the graph and validate it in the process. This |
| 121 |
@@ -4802,7 +4797,7 @@ |
| 122 |
mydepgraph = depgraph(settings, trees, |
| 123 |
myopts, myparams, spinner) |
| 124 |
try: |
| 125 |
- success = mydepgraph.loadResumeCommand(mtimedb["resume"], |
| 126 |
+ success = mydepgraph._loadResumeCommand(mtimedb["resume"], |
| 127 |
skip_masked=skip_masked) |
| 128 |
except depgraph.UnsatisfiedResumeDep, e: |
| 129 |
if not skip_unsatisfied: |
Archives