| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-03 11:42:06 +0000 (Thu, 03 Jul 2008) |
| 3 |
New Revision: 10912 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Remove old unused vars inside _execute_task() and fix code not to use the |
| 9 |
old vars. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-03 11:17:43 UTC (rev 10911) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-03 11:42:06 UTC (rev 10912) |
| 16 |
@@ -7465,36 +7465,19 @@ |
| 17 |
world_set.unlock() |
| 18 |
|
| 19 |
def _execute_task(self, pkg): |
| 20 |
- favorites = self._favorites |
| 21 |
- mtimedb = self._mtimedb |
| 22 |
- prefetchers = self._prefetchers |
| 23 |
- pkg_count = self._pkg_count |
| 24 |
- mergecount = pkg_count.curval |
| 25 |
- mymergelist = self._mergelist |
| 26 |
- pkgsettings = self.pkgsettings[pkg.root] |
| 27 |
+ |
| 28 |
buildpkgonly = "--buildpkgonly" in self.myopts |
| 29 |
fetch_all = "--fetch-all-uri" in self.myopts |
| 30 |
fetchonly = fetch_all or "--fetchonly" in self.myopts |
| 31 |
- failed_fetches = self._failed_fetches |
| 32 |
- |
| 33 |
- oneshot = "--oneshot" in self.myopts or \ |
| 34 |
- "--onlydeps" in self.myopts |
| 35 |
pretend = "--pretend" in self.myopts |
| 36 |
+ |
| 37 |
+ pkgsettings = self.pkgsettings[pkg.root] |
| 38 |
+ mtimedb = self._mtimedb |
| 39 |
ldpath_mtimes = mtimedb["ldpath"] |
| 40 |
- xterm_titles = "notitles" not in self.settings.features |
| 41 |
+ failed_fetches = self._failed_fetches |
| 42 |
+ pkg_count = self._pkg_count |
| 43 |
+ prefetchers = self._prefetchers |
| 44 |
|
| 45 |
- x = pkg |
| 46 |
- y = None |
| 47 |
- root_config = pkg.root_config |
| 48 |
- system_set = root_config.sets["system"] |
| 49 |
- args_set = InternalPackageSet(favorites) |
| 50 |
- world_set = root_config.sets["world"] |
| 51 |
- vartree = self.trees[pkg.root]["vartree"] |
| 52 |
- portdb = root_config.trees["porttree"].dbapi |
| 53 |
- bindb = root_config.trees["bintree"].dbapi |
| 54 |
- pkg_type, myroot, pkg_key, operation = x |
| 55 |
- pkgindex = 2 |
| 56 |
- metadata = pkg.metadata |
| 57 |
if not pkg.installed: |
| 58 |
pkg_count.curval += 1 |
| 59 |
mergecount = pkg_count.curval |
| 60 |
@@ -7507,22 +7490,18 @@ |
| 61 |
raise self._pkg_failure(retval) |
| 62 |
return |
| 63 |
|
| 64 |
- if x[0]=="blocks": |
| 65 |
- pkgindex=3 |
| 66 |
+ if not pretend: |
| 67 |
+ portage.writemsg_stdout( |
| 68 |
+ "\n>>> Emerging (%s of %s) %s to %s\n" % \ |
| 69 |
+ (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), |
| 70 |
+ colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), |
| 71 |
+ colorize("GOOD", pkg.cpv), pkg.root), noiselevel=-1) |
| 72 |
+ self._logger.log(" >>> emerge (%s of %s) %s to %s" % \ |
| 73 |
+ (pkg_count.curval, pkg_count.maxval, pkg.cpv, pkg.root)) |
| 74 |
|
| 75 |
- if "--pretend" not in self.myopts: |
| 76 |
- print "\n>>> Emerging (" + \ |
| 77 |
- colorize("MERGE_LIST_PROGRESS", str(mergecount)) + " of " + \ |
| 78 |
- colorize("MERGE_LIST_PROGRESS", str(len(mymergelist))) + ") " + \ |
| 79 |
- colorize("GOOD", x[pkgindex]) + " to " + x[1] |
| 80 |
- emergelog(xterm_titles, " >>> emerge ("+\ |
| 81 |
- str(mergecount)+" of "+str(len(mymergelist))+\ |
| 82 |
- ") "+x[pkgindex]+" to "+x[1]) |
| 83 |
- |
| 84 |
self._schedule() |
| 85 |
|
| 86 |
- if x.type_name == "ebuild": |
| 87 |
- y = portdb.findname(pkg.cpv) |
| 88 |
+ if pkg.type_name == "ebuild": |
| 89 |
build = EbuildBuild(args_set=self._args_set, |
| 90 |
find_blockers=self._find_blockers(pkg), |
| 91 |
ldpath_mtimes=ldpath_mtimes, logger=self._logger, |
| 92 |
@@ -7536,7 +7515,7 @@ |
| 93 |
else: |
| 94 |
raise self._pkg_failure(retval) |
| 95 |
|
| 96 |
- elif x.type_name == "binary": |
| 97 |
+ elif pkg.type_name == "binary": |
| 98 |
binpkg = Binpkg(find_blockers=self._find_blockers(pkg), |
| 99 |
ldpath_mtimes=ldpath_mtimes, logger=self._logger, |
| 100 |
opts=self._binpkg_opts, pkg=pkg, pkg_count=pkg_count, |
| 101 |
|
| 102 |
-- |
| 103 |
gentoo-commits@l.g.o mailing list |
Archives