| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-04 11:12:01 +0000 (Fri, 04 Jul 2008) |
| 3 |
New Revision: 10926 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Split out a Scheduler._execute_pkg() method from _merge(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-04 10:48:41 UTC (rev 10925) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-04 11:12:01 UTC (rev 10926) |
| 15 |
@@ -7504,31 +7504,13 @@ |
| 16 |
# blockers |
| 17 |
continue |
| 18 |
|
| 19 |
- if not pkg.installed: |
| 20 |
- self._pkg_count.curval += 1 |
| 21 |
+ retval = self._execute_pkg(pkg) |
| 22 |
|
| 23 |
- merge = MergeListItem(args_set=self._args_set, |
| 24 |
- binpkg_opts=self._binpkg_opts, |
| 25 |
- build_opts=self._build_opts, |
| 26 |
- emerge_opts=self.myopts, |
| 27 |
- failed_fetches=self._failed_fetches, |
| 28 |
- find_blockers=self._find_blockers(pkg), logger=self._logger, |
| 29 |
- mtimedb=self._mtimedb, pkg=pkg, pkg_count=self._pkg_count, |
| 30 |
- prefetcher=self._prefetchers.get(pkg), |
| 31 |
- scheduler=self._sched_iface, |
| 32 |
- settings=self.pkgsettings[pkg.root], |
| 33 |
- world_atom=self._world_atom) |
| 34 |
- |
| 35 |
- retval = merge.execute() |
| 36 |
- |
| 37 |
if retval != os.EX_OK: |
| 38 |
if not self._build_opts.fetchonly: |
| 39 |
return retval |
| 40 |
|
| 41 |
- self.curval += 1 |
| 42 |
- |
| 43 |
if pkg.installed: |
| 44 |
- # There's nothing left to do for uninstall. |
| 45 |
continue |
| 46 |
|
| 47 |
self._restart_if_necessary(pkg) |
| 48 |
@@ -7547,6 +7529,30 @@ |
| 49 |
self._task_queues.prefetch.clear() |
| 50 |
return os.EX_OK |
| 51 |
|
| 52 |
+ def _execute_pkg(self, pkg): |
| 53 |
+ |
| 54 |
+ if not pkg.installed: |
| 55 |
+ self._pkg_count.curval += 1 |
| 56 |
+ |
| 57 |
+ merge = MergeListItem(args_set=self._args_set, |
| 58 |
+ binpkg_opts=self._binpkg_opts, |
| 59 |
+ build_opts=self._build_opts, |
| 60 |
+ emerge_opts=self.myopts, |
| 61 |
+ failed_fetches=self._failed_fetches, |
| 62 |
+ find_blockers=self._find_blockers(pkg), logger=self._logger, |
| 63 |
+ mtimedb=self._mtimedb, pkg=pkg, pkg_count=self._pkg_count, |
| 64 |
+ prefetcher=self._prefetchers.get(pkg), |
| 65 |
+ scheduler=self._sched_iface, |
| 66 |
+ settings=self.pkgsettings[pkg.root], |
| 67 |
+ world_atom=self._world_atom) |
| 68 |
+ |
| 69 |
+ retval = merge.execute() |
| 70 |
+ |
| 71 |
+ if retval == os.EX_OK: |
| 72 |
+ self.curval += 1 |
| 73 |
+ |
| 74 |
+ return retval |
| 75 |
+ |
| 76 |
def _save_resume_list(self): |
| 77 |
""" |
| 78 |
Do this before verifying the ebuild Manifests since it might |
| 79 |
|
| 80 |
-- |
| 81 |
gentoo-commits@l.g.o mailing list |
Archives