[gentoo-commits] dev/zorry:master commit in: gobs/pym/

["Magnus Granberg" <zorry@gentoo.org>]

commit:     51b93e28e0fe10e4ee18dd485841650c194ae198
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 23:29:11 2011 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 23:29:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=51b93e28

create emerge --info log file

---
 gobs/pym/Scheduler.py |    9 +++++--
 gobs/pym/build_log.py |   51 +++++++++++++++++++++++++++++++++++++++++++-----
 gobs/pym/flags.py     |   31 +++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/gobs/pym/Scheduler.py b/gobs/pym/Scheduler.py
index cab701c..2b694fc 100644
--- a/gobs/pym/Scheduler.py
+++ b/gobs/pym/Scheduler.py
@@ -1325,7 +1325,7 @@ class Scheduler(PollScheduler):
 	def _do_merge_exit(self, merge):
 		pkg = merge.merge.pkg
 		settings = merge.merge.settings
-		trees = self.trees[merge.merge.settings["ROOT"]]
+		trees = self.trees
 		init_buildlog = gobs_buildlog()
 		if merge.returncode != os.EX_OK:
 			build_dir = settings.get("PORTAGE_BUILDDIR")
@@ -1395,13 +1395,16 @@ class Scheduler(PollScheduler):
 				self._status_display.merges = len(self._task_queues.merge)
 		else:
 			settings = build.settings
+			trees = self.trees
+			pkg=build.pkg
+			init_buildlog = gobs_buildlog()
 			build_dir = settings.get("PORTAGE_BUILDDIR")
 			build_log = settings.get("PORTAGE_LOG_FILE")
 
 			self._failed_pkgs.append(self._failed_pkg(
 				build_dir=build_dir, build_log=build_log,
-				pkg=build.pkg,
-				returncode=build.returncode))
+				pkg, 	returncode=build.returncode))
+				init_buildlog.add_buildlog_main(settings, pkg, trees)
 			if not self._terminated_tasks:
 				self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for")
 				self._status_display.failed = len(self._failed_pkgs)

diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py
index 7ffe53a..4ad098b 100644
--- a/gobs/pym/build_log.py
+++ b/gobs/pym/build_log.py
@@ -11,12 +11,15 @@ from _emerge.main import parse_opts, load_emerge_config, \
         getportageversion
 from portage.util import writemsg, \
         writemsg_level, writemsg_stdout
+from _emerge.actions import _info_pkgs_ver
 from portage.exception import InvalidAtom
 from portage.dep import Atom
 from portage.dbapi._expand_new_virt import expand_new_virt
 from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH
 from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG
 from portage.versions import catpkgsplit, cpv_getversion
+from portage import _encodings
+from portage import _unicode_encode
 from gobs.repoman_gobs import gobs_repoman
 import portage
 from gobs.package import gobs_package
@@ -55,7 +58,8 @@ class gobs_buildlog(object):
 		build_dict['categories'] = categories
 		build_dict['package'] = package
 		build_dict['config_profile'] = self._config_profile
-		final_use_list = list(pkg.use.enabled)
+		init_useflags = gobs_use_flags(settings, myportdb, pkg.cpv)
+		iuse_flags_list, final_use_list = init_useflags.get_flags_pkg(pkg, settings)
 		#print 'final_use_list', final_use_list
 		if  final_use_list != []:
 			build_dict['build_useflags'] = final_use_list
@@ -82,8 +86,7 @@ class gobs_buildlog(object):
 		conn=CM.getConnection()
 		portdb = portage.portdbapi(mysettings=settings)
 		init_useflags = gobs_use_flags(settings, portdb, build_dict['cpv'])
-		iuse_flags_list = list(pkg.iuse.all)
-		final_use_list = list(pkg.use.enabled)
+		iuse_flags_list, final_use_list = init_useflags.get_flags_pkg(pkg, settings)
 		iuse = []
 		use_flags_list = []
 		use_enable_list = []
@@ -220,7 +223,6 @@ class gobs_buildlog(object):
 
 		lastSync = portage.grabfile(os.path.join(
 			settings["PORTDIR"], "metadata", "timestamp.chk"))
-		msg.append("Timestamp of tree:", end=' ')
 		if lastSync:
 			msg.append("Timestamp of tree:" + lastSync[0] + "\n")
 		else:
@@ -341,7 +343,7 @@ class gobs_buildlog(object):
 		unset_vars = []
 		myvars.sort()
 		for x in myvars:
-			if x in self._mysettings:
+			if x in settings:
 				if x != "USE":
 					default = myvars_ignore_defaults.get(x)
 					if default is not None and \
@@ -495,6 +497,40 @@ class gobs_buildlog(object):
 						tree="bintree")
 					shutil.rmtree(tmpdir)
 		print('emerge info list', msg)
+		return msg
+
+	def write_msg_file(self, msg, log_path):
+		"""
+		Output msg to stdout if not self._background. If log_path
+		is not None then append msg to the log (appends with
+		compression if the filename extension of log_path
+		corresponds to a supported compression type).
+		"""
+		msg_shown = False
+		if log_path is not None:
+			try:
+				f = open(_unicode_encode(log_path,
+					encoding=_encodings['fs'], errors='strict'),
+					mode='ab')
+				f_real = f
+			except IOError as e:
+				if e.errno not in (errno.ENOENT, errno.ESTALE):
+					raise
+				if not msg_shown:
+					writemsg_level(msg, level=level, noiselevel=noiselevel)
+			else:
+
+				if log_path.endswith('.gz'):
+					# NOTE: The empty filename argument prevents us from
+					# triggering a bug in python3 which causes GzipFile
+					# to raise AttributeError if fileobj.name is bytes
+					# instead of unicode.
+					f =  gzip.GzipFile(filename='', mode='ab', fileobj=f)
+
+				f.write(_unicode_encode(msg))
+				f.close()
+				if f_real is not f:
+					f_real.close()
 
 	def add_buildlog_main(self, settings, pkg, trees):
 		conn=CM.getConnection()
@@ -518,5 +554,8 @@ class gobs_buildlog(object):
 		else:
 			build_id = move_queru_buildlog(conn, build_dict['queue_id'], build_error, summary_error, build_log_dict)
 		# update_qa_repoman(conn, build_id, build_log_dict)
-		self.action_info(settings, trees)
+		msg = self.action_info(settings, trees)
+		emerge_info_logfilename = settings.get("PORTAGE_LOG_FILE")[:-3] + "emerge_log.log"
+		for msg_line in msg:
+			self.write_msg_file(msg_line, emerge_info_logfilename)
 		print("build_id", build_id[0], "logged to db.")

diff --git a/gobs/pym/flags.py b/gobs/pym/flags.py
index ef63361..7ccf90b 100644
--- a/gobs/pym/flags.py
+++ b/gobs/pym/flags.py
@@ -118,6 +118,20 @@ class gobs_use_flags(object):
 		useforce = list(self._mysettings.useforce)
 		return use, use_expand_hidden, usemask, useforce
 
+	def get_all_cpv_use_pkg(self, pkg, settings):
+		"""Uses portage to determine final USE flags and settings for an emerge
+		@type cpv: string
+		@param cpv: eg cat/pkg-ver
+		@rtype: lists
+		@return  use, use_expand_hidden, usemask, useforce
+		"""
+		# use = self._mysettings['PORTAGE_USE'].split()
+		use_list = list(pkg.use.enabled)
+		use_expand_hidden = settings["USE_EXPAND_HIDDEN"].split()
+		usemask = list(settings.usemask)
+		useforced = list(settings.useforce)
+		return use_list, use_expand_hidden, usemask, useforced
+
 	def get_flags(self):
 		"""Retrieves all information needed to filter out hidden, masked, etc.
 		USE flags for a given package.
@@ -154,6 +168,23 @@ class gobs_use_flags(object):
 		final_flags = self.filter_flags(final_use, use_expand_hidden, usemasked, useforced)
 		return iuse_flags, final_flags
 
+	def get_flags_pkg(self, pkg, settings):
+		"""Retrieves all information needed to filter out hidden, masked, etc.
+		USE flags for a given package.
+		@type cpv: string
+		@param cpv: eg. cat/pkg-ver
+		@type final_setting: boolean
+		@param final_setting: used to also determine the final
+		enviroment USE flag settings and return them as well.
+		@rtype: list or list, list
+		@return IUSE or IUSE, final_flags
+		"""
+		final_use, use_expand_hidden, usemasked, useforced = self.get_all_cpv_use_pkg(pkg, settings)
+		iuse_flags = self.filter_flags(list(pkg.iuse.all), use_expand_hidden, usemasked, useforced)
+		#flags = filter_flags(use_flags, use_expand_hidden, usemasked, useforced)
+		final_flags = self.filter_flags(final_use, use_expand_hidden, usemasked, useforced)
+		return iuse_flags, final_flags
+
 	def comper_useflags(self, build_dict):
 		iuse_flags, use_enable = self.get_flags()
 		iuse = []