| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-03 12:04:45 +0000 (Thu, 03 Jul 2008) |
| 3 |
New Revision: 10913 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Split out a _create_prefetcher() method from _add_prefetchers(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-03 11:42:06 UTC (rev 10912) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-03 12:04:45 UTC (rev 10913) |
| 15 |
@@ -7168,22 +7168,34 @@ |
| 16 |
getbinpkg = "--getbinpkg" in self.myopts |
| 17 |
|
| 18 |
for pkg in self._mergelist: |
| 19 |
- if not isinstance(pkg, Package): |
| 20 |
- continue |
| 21 |
- if pkg.type_name == "ebuild": |
| 22 |
- self._add_task(EbuildFetcherAsync( |
| 23 |
- logfile=self._fetch_log, |
| 24 |
- pkg=pkg, register=self._register, |
| 25 |
- unregister=self._unregister)) |
| 26 |
- elif pkg.type_name == "binary" and getbinpkg and \ |
| 27 |
- pkg.root_config.trees["bintree"].isremote(pkg.cpv): |
| 28 |
- prefetcher = BinpkgFetcherAsync( |
| 29 |
- logfile=self._fetch_log, |
| 30 |
- pkg=pkg, register=self._register, |
| 31 |
- unregister=self._unregister) |
| 32 |
+ prefetcher = self._create_prefetcher(pkg) |
| 33 |
+ if prefetcher is not None: |
| 34 |
+ self._add_task(prefetcher) |
| 35 |
prefetchers[pkg] = prefetcher |
| 36 |
- self._add_task(prefetcher) |
| 37 |
|
| 38 |
+ def _create_prefetcher(self, pkg): |
| 39 |
+ """ |
| 40 |
+ @return: a prefetcher, or None if not applicable |
| 41 |
+ """ |
| 42 |
+ prefetcher = None |
| 43 |
+ |
| 44 |
+ if not isinstance(pkg, Package): |
| 45 |
+ pass |
| 46 |
+ |
| 47 |
+ elif pkg.type_name == "ebuild": |
| 48 |
+ |
| 49 |
+ prefetcher = EbuildFetcherAsync(logfile=self._fetch_log, pkg=pkg, |
| 50 |
+ register=self._register, unregister=self._unregister) |
| 51 |
+ |
| 52 |
+ elif pkg.type_name == "binary" and \ |
| 53 |
+ "--getbinpkg" in self.myopts and \ |
| 54 |
+ pkg.root_config.trees["bintree"].isremote(pkg.cpv): |
| 55 |
+ |
| 56 |
+ prefetcher = BinpkgFetcherAsync(logfile=self._fetch_log, |
| 57 |
+ pkg=pkg, register=self._register, unregister=self._unregister) |
| 58 |
+ |
| 59 |
+ return prefetcher |
| 60 |
+ |
| 61 |
def _show_failed_fetches(self): |
| 62 |
failed_fetches = self._failed_fetches |
| 63 |
if not failed_fetches or not \ |
| 64 |
|
| 65 |
-- |
| 66 |
gentoo-commits@l.g.o mailing list |
Archives