From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QSRRC-0001Sa-V8 for garchives@archives.gentoo.org; Fri, 03 Jun 2011 10:17:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E6761C00A; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BC34F1C001 for ; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 141AF1BC012 for ; Fri, 3 Jun 2011 10:16:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6858A8050C for ; Fri, 3 Jun 2011 10:16:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <70c2a622e33e158066233da8c5ba3300d0c8fa61.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 70c2a622e33e158066233da8c5ba3300d0c8fa61 Date: Fri, 3 Jun 2011 10:16:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4df3bf8b734fa6b0860f3f6546848d7a commit: 70c2a622e33e158066233da8c5ba3300d0c8fa61 Author: Zac Medico gentoo org> AuthorDate: Fri Jun 3 10:16:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 3 10:16:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D70c2a622 dblink.merge: remove unused scheduler callbacks --- pym/_emerge/Scheduler.py | 68 +-----------------------------------= ----- pym/portage/dbapi/vartree.py | 69 +++++++++++++++++-------------------= ----- 2 files changed, 30 insertions(+), 107 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index b10439a..bdc13aa 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -86,8 +86,7 @@ class Scheduler(PollScheduler): _fetch_log =3D os.path.join(_emerge_log_dir, 'emerge-fetch.log') =20 class _iface_class(SlotObject): - __slots__ =3D ("dblinkEbuildPhase", "dblinkDisplayMerge", - "dblinkElog", "dblinkEmergeLog", "fetch", + __slots__ =3D ("fetch", "output", "register", "schedule", "scheduleSetup", "scheduleUnpack", "scheduleYield", "unregister") @@ -220,10 +219,6 @@ class Scheduler(PollScheduler): fetch_iface =3D self._fetch_iface_class(log_file=3Dself._fetch_log, schedule=3Dself._schedule_fetch) self._sched_iface =3D self._iface_class( - dblinkEbuildPhase=3Dself._dblink_ebuild_phase, - dblinkDisplayMerge=3Dself._dblink_display_merge, - dblinkElog=3Dself._dblink_elog, - dblinkEmergeLog=3Dself._dblink_emerge_log, fetch=3Dfetch_iface, output=3Dself._task_output, register=3Dself._register, schedule=3Dself._schedule_wait, @@ -613,67 +608,6 @@ class Scheduler(PollScheduler): =20 return blocker_dblinks =20 - def _dblink_pkg(self, pkg_dblink): - cpv =3D pkg_dblink.mycpv - type_name =3D RootConfig.tree_pkg_map[pkg_dblink.treetype] - root_config =3D self.trees[pkg_dblink.myroot]["root_config"] - installed =3D type_name =3D=3D "installed" - repo =3D pkg_dblink.settings.get("PORTAGE_REPO_NAME") - return self._pkg(cpv, type_name, root_config, - installed=3Dinstalled, myrepo=3Drepo) - - def _dblink_elog(self, pkg_dblink, phase, func, msgs): - - log_path =3D pkg_dblink.settings.get("PORTAGE_LOG_FILE") - out =3D StringIO() - - for msg in msgs: - func(msg, phase=3Dphase, key=3Dpkg_dblink.mycpv, out=3Dout) - - out_str =3D out.getvalue() - - self._task_output(out_str, log_path=3Dlog_path) - - def _dblink_emerge_log(self, msg): - self._logger.log(msg) - - def _dblink_display_merge(self, pkg_dblink, msg, level=3D0, noiselevel=3D= 0): - log_path =3D pkg_dblink.settings.get("PORTAGE_LOG_FILE") - background =3D self._background - - if log_path is None: - if not (background and level < logging.WARN): - portage.util.writemsg_level(msg, - level=3Dlevel, noiselevel=3Dnoiselevel) - else: - self._task_output(msg, log_path=3Dlog_path) - - def _dblink_ebuild_phase(self, - pkg_dblink, pkg_dbapi, ebuild_path, phase): - """ - Using this callback for merge phases allows the scheduler - to run while these phases execute asynchronously, and allows - the scheduler control output handling. - """ - - scheduler =3D self._sched_iface - settings =3D pkg_dblink.settings - background =3D self._background - log_path =3D settings.get("PORTAGE_LOG_FILE") - - if phase in ('die_hooks', 'success_hooks'): - ebuild_phase =3D MiscFunctionsProcess(background=3Dbackground, - commands=3D[phase], phase=3Dphase, - scheduler=3Dscheduler, settings=3Dsettings) - else: - ebuild_phase =3D EbuildPhase(background=3Dbackground, - phase=3Dphase, scheduler=3Dscheduler, - settings=3Dsettings) - ebuild_phase.start() - ebuild_phase.wait() - - return ebuild_phase.returncode - def _generate_digests(self): """ Generate digests if necessary for --digests or FEATURES=3Ddigest. diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 889cb58..16cf48b 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -57,6 +57,7 @@ from portage import _unicode_encode from _emerge.AsynchronousLock import AsynchronousLock from _emerge.EbuildBuildDir import EbuildBuildDir from _emerge.EbuildPhase import EbuildPhase +from _emerge.emergelog import emergelog from _emerge.PollScheduler import PollScheduler from _emerge.MiscFunctionsProcess import MiscFunctionsProcess =20 @@ -2957,6 +2958,9 @@ class dblink(object): if str_buffer: os.write(self._pipe, _unicode_encode(''.join(str_buffer))) =20 + def _emerge_log(self, msg): + emergelog(False, msg) + def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=3D0, mydbapi=3DNone, prev_mtimes=3DNone, counter=3DNone): """ @@ -3003,8 +3007,6 @@ class dblink(object): encoding=3D_encodings['content'], errors=3D'strict') =20 showMessage =3D self._display_merge - scheduler =3D self._scheduler - srcroot =3D normalize_path(srcroot).rstrip(os.path.sep) + os.path.sep =20 if not os.path.isdir(srcroot): @@ -3359,12 +3361,12 @@ class dblink(object): ensure_dirs(self.dbtmpdir) =20 # run preinst script - if scheduler is None: - showMessage(_(">>> Merging %(cpv)s to %(destroot)s\n") % {"cpv":self.= mycpv, "destroot":destroot}) - a =3D _spawn_phase("preinst", self.settings) - else: - a =3D scheduler.dblinkEbuildPhase( - self, mydbapi, myebuild, "preinst") + showMessage(_(">>> Merging %(cpv)s to %(destroot)s\n") % \ + {"cpv":self.mycpv, "destroot":destroot}) + phase =3D EbuildPhase(background=3DFalse, phase=3D"preinst", + scheduler=3Dself._scheduler, settings=3Dself.settings) + phase.start() + a =3D phase.wait() =20 # XXX: Decide how to handle failures here. if a !=3D os.EX_OK: @@ -3459,11 +3461,7 @@ class dblink(object): match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): reinstall_self =3D True =20 - if scheduler is None: - def emerge_log(msg): - pass - else: - emerge_log =3D scheduler.dblinkEmergeLog + emerge_log =3D self._emerge_log =20 # If we have any preserved libraries then autoclean # is forced so that preserve-libs logic doesn't have @@ -3608,13 +3606,12 @@ class dblink(object): os.path.join(self.dbpkgdir, "environment.bz2") self.settings.backup_changes("PORTAGE_UPDATE_ENV") try: - if scheduler is None: - a =3D _spawn_phase("postinst", self.settings) - if a =3D=3D os.EX_OK: - showMessage(_(">>> %s merged.\n") % self.mycpv) - else: - a =3D scheduler.dblinkEbuildPhase( - self, mydbapi, myebuild, "postinst") + phase =3D EbuildPhase(background=3DFalse, phase=3D"postinst", + scheduler=3Dself._scheduler, settings=3Dself.settings) + phase.start() + a =3D phase.wait() + if a =3D=3D os.EX_OK: + showMessage(_(">>> %s merged.\n") % self.mycpv) finally: self.settings.pop("PORTAGE_UPDATE_ENV", None) =20 @@ -4068,6 +4065,8 @@ class dblink(object): if not parallel_install: self.lockdb() self.vartree.dbapi._bump_mtime(self.mycpv) + if self._scheduler is None: + self._scheduler =3D PollScheduler().sched_iface try: retval =3D self.treewalk(mergeroot, myroot, inforoot, myebuild, cleanup=3Dcleanup, mydbapi=3Dmydbapi, prev_mtimes=3Dprev_mtimes, @@ -4075,8 +4074,7 @@ class dblink(object): =20 # If PORTAGE_BUILDDIR doesn't exist, then it probably means # fail-clean is enabled, and the success/die hooks have - # already been called by _emerge.EbuildPhase (via - # self._scheduler.dblinkEbuildPhase) prior to cleaning. + # already been called by EbuildPhase. if os.path.isdir(self.settings['PORTAGE_BUILDDIR']): =20 if retval =3D=3D os.EX_OK: @@ -4084,18 +4082,11 @@ class dblink(object): else: phase =3D 'die_hooks' =20 - if self._scheduler is None: - ebuild_phase =3D MiscFunctionsProcess( - background=3DFalse, - commands=3D[phase], - scheduler=3DPollScheduler().sched_iface, - settings=3Dself.settings) - ebuild_phase.start() - ebuild_phase.wait() - else: - self._scheduler.dblinkEbuildPhase( - self, mydbapi, myebuild, phase) - + ebuild_phase =3D MiscFunctionsProcess( + background=3DFalse, commands=3D[phase], + scheduler=3Dself._scheduler, settings=3Dself.settings) + ebuild_phase.start() + ebuild_phase.wait() self._elog_process() =20 if 'noclean' not in self.settings.features and \ @@ -4106,12 +4097,10 @@ class dblink(object): =20 doebuild_environment(myebuild, "clean", settings=3Dself.settings, db=3Dmydbapi) - if self._scheduler is None: - _spawn_phase("clean", self.settings) - else: - self._scheduler.dblinkEbuildPhase( - self, mydbapi, myebuild, "clean") - + phase =3D EbuildPhase(background=3DFalse, phase=3D"clean", + scheduler=3Dself._scheduler, settings=3Dself.settings) + phase.start() + phase.wait() finally: self.settings.pop('REPLACING_VERSIONS', None) if self.vartree.dbapi._linkmap is None: