[gentoo-commits] dev/zorry:master commit in: /, ebuild/dev-python/gobs/files/, gobs/pym/

[Magnus Granberg]

commit:     be66151836a778223804a22382975308859cd014
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 14:24:30 2014 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 14:24:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=be661518

add package metadata and emerge --info to db

---
 .gitignore                                         |   2 +
 .../gobs/files/zobcs_portage_Scheduler.patch       |  10 +-
 gobs/pym/Scheduler.py                              |   8 +-
 gobs/pym/actions.py                                |  67 +++----
 gobs/pym/build_depgraph.py                         |   2 +-
 gobs/pym/build_log.py                              | 212 ++++++++++++++-------
 gobs/pym/manifest.py                               |   5 +-
 gobs/pym/mysql_querys.py                           |  61 +++++-
 gobs/pym/package.py                                |  41 ++--
 9 files changed, 271 insertions(+), 137 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce3cbfc..88cd6f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # Backup files
 *~
+# Python compiled files
+*.pyc
\ No newline at end of file

diff --git a/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch b/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch
index a4f8a97..df76a7b 100644
--- a/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch
+++ b/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch
@@ -24,7 +24,7 @@
  			if not self._terminated_tasks:
  				self._failed_pkg_msg(self._failed_pkgs[-1], "install", "to")
  				self._status_display.failed = len(self._failed_pkgs)
-+			add_buildlog_main(settings, pkg)
++			add_buildlog_main(settings, pkg, trees)
  			return
  
  		self._task_complete(pkg)
@@ -32,7 +32,7 @@
  				self._pkg_cache.pop(pkg_to_replace, None)
  
  		if pkg.installed:
-+			add_buildlog_main(settings, pkg)
++			add_buildlog_main(settings, pkg, trees)
  			return
  
  		# Call mtimedb.commit() after each merge so that
@@ -40,7 +40,7 @@
  		if not mtimedb["resume"]["mergelist"]:
  			del mtimedb["resume"]
  		mtimedb.commit()
-+		add_buildlog_main(settings, pkg)
++		add_buildlog_main(settings, pkg, trees)
  
  	def _build_exit(self, build):
  		self._running_tasks.pop(id(build), None)
@@ -49,7 +49,7 @@
  		else:
  			settings = build.settings
 +			trees = self.trees
-+			pkg=build.pkg
++			pkg = build.pkg
  			build_dir = settings.get("PORTAGE_BUILDDIR")
  			build_log = settings.get("PORTAGE_LOG_FILE")
  
@@ -57,7 +57,7 @@
  				self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for")
  				self._status_display.failed = len(self._failed_pkgs)
  			self._deallocate_config(build.settings)
-+			add_buildlog_main(settings, pkg)
++			add_buildlog_main(settings, pkg, trees)
  		self._jobs -= 1
  		self._status_display.running = self._jobs
  		self._schedule()

diff --git a/gobs/pym/Scheduler.py b/gobs/pym/Scheduler.py
index 3aaf147..944dcf7 100644
--- a/gobs/pym/Scheduler.py
+++ b/gobs/pym/Scheduler.py
@@ -1269,7 +1269,7 @@ class Scheduler(PollScheduler):
 			if not self._terminated_tasks:
 				self._failed_pkg_msg(self._failed_pkgs[-1], "install", "to")
 				self._status_display.failed = len(self._failed_pkgs)
-			add_buildlog_main(settings, pkg)
+			add_buildlog_main(settings, pkg, trees)
 			return
 
 		self._task_complete(pkg)
@@ -1288,7 +1288,7 @@ class Scheduler(PollScheduler):
 				self._pkg_cache.pop(pkg_to_replace, None)
 
 		if pkg.installed:
-			add_buildlog_main(settings, pkg)
+			add_buildlog_main(settings, pkg, trees)
 			return
 
 		# Call mtimedb.commit() after each merge so that
@@ -1299,7 +1299,7 @@ class Scheduler(PollScheduler):
 		if not mtimedb["resume"]["mergelist"]:
 			del mtimedb["resume"]
 		mtimedb.commit()
-		add_buildlog_main(settings, pkg)
+		add_buildlog_main(settings, pkg, trees)
 
 	def _build_exit(self, build):
 		self._running_tasks.pop(id(build), None)
@@ -1337,7 +1337,7 @@ class Scheduler(PollScheduler):
 				self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for")
 				self._status_display.failed = len(self._failed_pkgs)
 			self._deallocate_config(build.settings)
-			add_buildlog_main(settings, pkg)
+			add_buildlog_main(settings, pkg, trees)
 		self._jobs -= 1
 		self._status_display.running = self._jobs
 		self._schedule()

diff --git a/gobs/pym/actions.py b/gobs/pym/actions.py
index e29d8e0..9c38c1a 100644
--- a/gobs/pym/actions.py
+++ b/gobs/pym/actions.py
@@ -609,7 +609,7 @@ def action_depclean(settings, trees, ldpath_mtimes,
 	# The calculation is done in a separate function so that depgraph
 	# references go out of scope and the corresponding memory
 	# is freed before we call unmerge().
-	rval, cleanlist, ordered, req_pkg_count = \
+	rval, cleanlist, ordered, req_pkg_count, unresolvable = \
 		calc_depclean(settings, trees, ldpath_mtimes,
 			myopts, action, args_set, spinner)
 
@@ -812,7 +812,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 	resolver.display_problems()
 
 	if not success:
-		return 1, [], False, 0
+		return 1, [], False, 0, []
 
 	def unresolved_deps():
 
@@ -823,7 +823,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 				unresolvable.add((dep.atom, dep.parent.cpv))
 
 		if not unresolvable:
-			return False
+			return None
 
 		if unresolvable and not allow_missing_deps:
 
@@ -873,11 +873,12 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 					"dependencies then use %s." % good("--nodeps"))
 			writemsg_level("".join("%s%s\n" % (prefix, line) for line in msg),
 				level=logging.ERROR, noiselevel=-1)
-			return True
-		return False
+			return unresolvable
+		return None
 
-	if unresolved_deps():
-		return 1, [], False, 0
+	unresolvable = unresolved_deps():
+	if not unresolvable is None:
+		return 1, [], False, 0, unresolvable
 
 	graph = resolver._dynamic_config.digraph.copy()
 	required_pkgs_total = 0
@@ -1156,7 +1157,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 						priority=UnmergeDepPriority(runtime=True),
 						root=pkg.root)):
 						resolver.display_problems()
-						return 1, [], False, 0
+						return 1, [], False, 0, []
 
 			writemsg_level("\nCalculating dependencies  ")
 			success = resolver._complete_graph(
@@ -1164,9 +1165,10 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 			writemsg_level("\b\b... done!\n")
 			resolver.display_problems()
 			if not success:
-				return 1, [], False, 0
-			if unresolved_deps():
-				return 1, [], False, 0
+				return 1, [], False, 0, []
+			unresolvable = unresolved_deps():
+			if not unresolvable is None:
+				return 1, [], False, 0, unresolvable
 
 			graph = resolver._dynamic_config.digraph.copy()
 			required_pkgs_total = 0
@@ -1175,7 +1177,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 					required_pkgs_total += 1
 			cleanlist = create_cleanlist()
 			if not cleanlist:
-				return 0, [], False, required_pkgs_total
+				return 0, [], False, required_pkgs_total, []
 			clean_set = set(cleanlist)
 
 	if clean_set:
@@ -1285,8 +1287,8 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 					graph.remove(node)
 					cleanlist.append(node.cpv)
 
-		return 0, cleanlist, ordered, required_pkgs_total
-	return 0, [], False, required_pkgs_total
+		return 0, cleanlist, ordered, required_pkgs_total, []
+	return 0, [], False, required_pkgs_total, []
 
 def action_deselect(settings, trees, opts, atoms):
 	enter_invalid = '--ask-enter-invalid' in opts
@@ -1396,6 +1398,7 @@ def action_info(settings, trees, myopts, myfiles):
 	# See if we can find any packages installed matching the strings
 	# passed on the command line
 	mypkgs = []
+	output_buffer = []
 	eroot = settings['EROOT']
 	vardb = trees[eroot]["vartree"].dbapi
 	portdb = trees[eroot]['porttree'].dbapi
@@ -1471,9 +1474,8 @@ def action_info(settings, trees, myopts, myfiles):
 					writemsg(" nothing similar found.\n"
 						, noiselevel=-1)
 
-			return 1
+			return output_buffer
 
-	output_buffer = []
 	append = output_buffer.append
 	root_config = trees[settings['EROOT']]['root_config']
 	running_eroot = trees._running_eroot
@@ -1688,8 +1690,6 @@ def action_info(settings, trees, myopts, myfiles):
 		append("Unset:  "+", ".join(unset_vars))
 	append("")
 	append("")
-	writemsg_stdout("\n".join(output_buffer),
-		noiselevel=-1)
 
 	# If some packages were found...
 	if mypkgs:
@@ -1703,9 +1703,9 @@ def action_info(settings, trees, myopts, myfiles):
 		# Loop through each package
 		# Only print settings if they differ from global settings
 		header_title = "Package Settings"
-		print(header_width * "=")
-		print(header_title.rjust(int(header_width/2 + len(header_title)/2)))
-		print(header_width * "=")
+		append(header_width * "=")
+		append(header_title.rjust(int(header_width/2 + len(header_title)/2)))
+		append(header_width * "=")
 		from portage.output import EOutput
 		out = EOutput()
 		for mypkg in mypkgs:
@@ -1725,28 +1725,23 @@ def action_info(settings, trees, myopts, myfiles):
 				root_config=root_config, type_name=pkg_type)
 
 			if pkg_type == "installed":
-				print("\n%s was built with the following:" % \
-					colorize("INFORM", str(pkg.cpv)))
+				append("\n%s was built with the following:" % str(pkg.cpv))
 			elif pkg_type == "ebuild":
-				print("\n%s would be build with the following:" % \
-					colorize("INFORM", str(pkg.cpv)))
+				append("\n%s would be build with the following:" % str(pkg.cpv))
 			elif pkg_type == "binary":
-				print("\n%s (non-installed binary) was built with the following:" % \
-					colorize("INFORM", str(pkg.cpv)))
+				append("\n%s (non-installed binary) was built with the following:" % str(pkg.cpv))
 
-			writemsg_stdout('%s\n' % pkg_use_display(pkg, myopts),
-				noiselevel=-1)
+			append('%s\n' % pkg_use_display(pkg, myopts))
 			if pkg_type == "installed":
 				for myvar in mydesiredvars:
 					if metadata[myvar].split() != settings.get(myvar, '').split():
-						print("%s=\"%s\"" % (myvar, metadata[myvar]))
-			print()
+						append("%s=\"%s\"" % (myvar, metadata[myvar]))
 
 			if metadata['DEFINED_PHASES']:
 				if 'info' not in metadata['DEFINED_PHASES'].split():
 					continue
 
-			print(">>> Attempting to run pkg_info() for '%s'" % pkg.cpv)
+			append(">>> Attempting to run pkg_info() for '%s'" % pkg.cpv)
 
 			if pkg_type == "installed":
 				ebuildpath = vardb.findname(pkg.cpv)
@@ -1782,6 +1777,7 @@ def action_info(settings, trees, myopts, myfiles):
 					mydbapi=trees[settings['EROOT']]["bintree"].dbapi,
 					tree="bintree")
 				shutil.rmtree(tmpdir)
+	return output_buffer
 
 def action_metadata(settings, portdb, myopts, porttrees=None):
 	if porttrees is None:
@@ -3893,7 +3889,12 @@ def run_action(settings, trees, mtimedb, myaction, myopts, myfiles, build_dict,
 				level=logging.ERROR, noiselevel=-1)
 			return 1
 
-		return action_info(settings, trees, myopts, valid_atoms)
+		msg_list = action_info(settings, trees, myopts, valid_atoms)
+		if msg_list == []:
+			return 1
+		writemsg_stdout("\n".join(msg_list),
+			noiselevel=-1)
+		return 0
 
 	# "update", "system", or just process files:
 	else:

diff --git a/gobs/pym/build_depgraph.py b/gobs/pym/build_depgraph.py
index 37b9722..e0002cd 100644
--- a/gobs/pym/build_depgraph.py
+++ b/gobs/pym/build_depgraph.py
@@ -27,7 +27,7 @@ def build_mydepgraph(settings, trees, mtimedb, myopts, myparams, myaction, myfil
 			repeat_times = 0
 			while repeat:
 				if mydepgraph._dynamic_config._needed_p_mask_changes:
-					build_dict['type_fail'] = "Mask packages"
+					build_dict['type_fail'] = "Mask package or dep"
 					build_dict['check_fail'] = True
 				elif mydepgraph._dynamic_config._needed_use_config_changes:
 					mydepgraph._display_autounmask()

diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py
index 0c170e1..38e2e25 100644
--- a/gobs/pym/build_log.py
+++ b/gobs/pym/build_log.py
@@ -11,6 +11,12 @@ from portage.util import writemsg, \
 from portage import _encodings
 from portage import _unicode_encode
 
+from _emerge.main import parse_opts
+
+portage.proxy.lazyimport.lazyimport(globals(),
+	'gobs.actions:action_info',
+)
+
 from gobs.repoman_gobs import gobs_repoman
 from gobs.text import get_log_text_list
 from gobs.package import gobs_package
@@ -19,7 +25,8 @@ from gobs.flags import gobs_use_flags
 from gobs.ConnectionManager import connectionManager
 from gobs.mysql_querys import add_gobs_logs, get_config_id, get_ebuild_id_db_checksum, add_new_buildlog, \
 	update_manifest_sql, get_package_id, get_build_job_id, get_use_id, get_fail_querue_dict, \
-	add_fail_querue_dict, update_fail_times, get_config, get_hilight_info, get error_info_list
+	add_fail_querue_dict, update_fail_times, get_config, get_hilight_info, get_error_info_list, \
+	add_old_ebuild
 
 def get_build_dict_db(conn, config_id, settings, pkg):
 	myportdb = portage.portdbapi(mysettings=settings)
@@ -60,7 +67,20 @@ def get_build_dict_db(conn, config_id, settings, pkg):
 	pkgdir = myportdb.getRepositoryPath(repo) + "/" + categories + "/" + package
 	ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + package + "-" + ebuild_version + ".ebuild")[0]
 	build_dict['checksum'] = ebuild_version_checksum_tree
-	ebuild_id = get_ebuild_id_db_checksum(conn, build_dict)
+	ebuild_id_list = get_ebuild_id_db_checksum(conn, build_dict)
+	if ebuild_id_list is None:
+		ebuild_id = None
+	elif len(ebuild_id_list) >= 2:
+		old_ebuild_id_list = []
+		for ebuild_id in ebuild_id_list:
+			if ebuild_id != ebuild_id_list[0]:
+				log_msg = "%s:%s:%s Dups of checksums" % (pkg.cpv, repo, ebuild_id,)
+				add_gobs_logs(conn, log_msg, "error", config_id)
+				old_ebuild_id_list.append(ebuild_id)
+		add_old_ebuild(conn, package_id, old_ebuild_id_list)
+		ebuild_id = ebuild_id_list[0]
+	else:
+		ebuild_id = ebuild_id_list[0]
 	if ebuild_id is None:
 		log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv, repo,)
 		add_gobs_logs(conn, log_msg, "info", config_id)
@@ -84,14 +104,15 @@ def get_build_dict_db(conn, config_id, settings, pkg):
 def search_buildlog(conn, logfile_text):
 	log_search_list = get_hilight_info(conn)
 	index = 0
-	hilight_list = []
+	new_hilight_dict = {}
 	for textline in logfile_text:
 		index = index + 1
 		for search_pattern in log_search_list:
 			if re.search(search_pattern['hilight_search'], textline):
 				hilight_tmp = {}
+				hilight_tmp['searchline'] = index
 				hilight_tmp['startline'] = index - search_pattern['hilight_start']
-				hilight_tmp['hilight'] =search_pattern ['hilight_css']
+				hilight_tmp['hilight'] = search_pattern ['hilight_css']
 				if search_pattern['hilight_search_end'] is None:
 					hilight_tmp['endline'] = index + search_pattern['hilight_end']
 				else:
@@ -105,47 +126,86 @@ def search_buildlog(conn, logfile_text):
 							else:
 								hilight_tmp['endline'] = i
 						else:
-							i = i +1
-				hilight_list.append(hilight_tmp)
-	new_hilight_dict = {}
-	for hilight_tmp in hilight_list:
-		add_new_hilight = True
-		add_new_hilight_middel = None
-		for k, v in sorted(new_hilight_dict.iteritems()):
-			if hilight_tmp['startline'] == hilight_tmp['endline']:
-				if v['endline'] == hilight_tmp['startline'] or v['startline'] == hilight_tmp['startline']:
-					add_new_hilight = False
-				if hilight_tmp['startline'] > v['startline'] and hilight_tmp['startline'] < v['endline']:
-					add_new_hilight = False
-					add_new_hilight_middel = k
-			else:
-				if v['endline'] == hilight_tmp['startline'] or v['startline'] == hilight_tmp['startline']:
-					add_new_hilight = False
-				if hilight_tmp['startline'] > v['startline'] and hilight_tmp['startline'] < v['endline']:
-					add_new_hilight = False
-		if add_new_hilight is True:
-			adict = {}
-			adict['startline'] = hilight_tmp['startline']
-			adict['hilight'] = hilight_tmp['hilight']
-			adict['endline'] = hilight_tmp['endline']
-			new_hilight_dict[hilight_tmp['startline']] = adict
-		if not add_new_hilight_middel is None:
-			adict1 = {}
-			adict2 = {}
-			adict3 = {}
-			adict1['startline'] = new_hilight_dict[add_new_hilight_middel]['startline']
-			adict1['endline'] = hilight_tmp['startline'] -1
-			adict1['hilight'] = new_hilight_dict[add_new_hilight_middel]['hilight']
-			adict2['startline'] = hilight_tmp['startline']
-			adict2['hilight'] = hilight_tmp['hilight']
-			adict2['endline'] = hilight_tmp['endline']
-			adict3['startline'] = hilight_tmp['endline'] + 1
-			adict3['hilight'] = new_hilight_dict[add_new_hilight_middel]['hilight']
-			adict3['endline'] = new_hilight_dict[add_new_hilight_middel]['endline']	
-			del new_hilight_dict[add_new_hilight_middel]
-			new_hilight_dict[adict1['startline']] = adict1
-			new_hilight_dict[adict2['startline']] = adict2
-			new_hilight_dict[adict3['startline']] = adict3
+							i = i + 1
+				if not hilight_tmp['startline'] in new_hilight_dict:
+					if hilight_tmp['startline'] != index and hilight_tmp['endline'] == index:
+						i = hilight_tmp['startline']
+						while i == index:
+							adict = {}
+							adict['hilight'] = None
+							new_hilight_dict[hilight_tmp[index]] = adict
+							i = i + 1
+						adict = {}
+						adict['hilight'] = hilight_tmp['hilight']
+						new_hilight_dict[hilight_tmp[index]] = adict
+					elif hilight_tmp['startline'] == index and hilight_tmp['endline'] != index:
+						i = index
+						while i == hilight_tmp['endline']:
+							adict = {}
+							if hilight_tmp['startline'] == index:
+								adict['hilight'] = hilight_tmp['hilight']
+							else:
+								adict['hilight'] = None
+							new_hilight_dict[hilight_tmp[i] = adict
+							i = i + 1
+					elif hilight_tmp['startline'] != index and hilight_tmp['endline'] != index:
+						i = hilight_tmp['startline']
+						while i == hilight_tmp['endline']:
+							adict = {}
+							if i == index:
+								adict['hilight'] = hilight_tmp['hilight']
+							else:
+								adict['hilight'] = None
+							new_hilight_dict[hilight_tmp[i]] = adict
+							i = i + 1
+						adict = {}
+						adict['hilight'] = hilight_tmp['hilight']
+						new_hilight_dict[hilight_tmp[i] = adict
+					else:
+						adict = {}
+						adict['hilight'] = hilight_tmp['hilight']
+						new_hilight_dict[hilight_tmp[index]] = adict
+				else:
+					if not index in new_hilight_dict:
+						i = index - 1
+						add_new_line = True
+						while add_new_line is True:
+							if i in new_hilight_dict:
+								add_new_line = False
+							else:
+								adict = {}
+								adict['hilight'] = None
+								new_hilight_dict[hilight_tmp[i]] = adict
+								i = i - 1
+						adict = {}
+						adict['hilight'] = hilight_tmp['hilight']
+						new_hilight_dict[hilight_tmp[index]] = adict
+						i = index + 1
+						if hilight_tmp['endline'] != index:
+							while i == hilight_tmp['endline']:
+								adict = {}
+								adict['hilight'] = None
+								new_hilight_dict[hilight_tmp[i]] = adict
+								i = i + 1
+							adict = {}
+							adict['hilight'] = hilight_tmp['hilight']
+							new_hilight_dict[hilight_tmp[i] = adict
+					elif index in new_hilight_dict:
+						if new_hilight_dict[hilight_tmp[index]][['hilight'] == None:
+							new_hilight_dict[hilight_tmp[index]][['hilight'] = hilight_tmp['hilight']
+							if hilight_tmp['endline'] != index:
+								i = index + 1
+								while i == hilight_tmp['endline']:
+									if not i in new_hilight_dict:
+										adict = {}
+										adict['hilight'] = None
+										new_hilight_dict[hilight_tmp[i]] = adict
+									i = i + 1
+								if not i in new_hilight_dict:
+									adict = {}
+									adict['hilight'] = hilight_tmp['hilight']
+									new_hilight_dict[hilight_tmp[i] = adict
+
 	return new_hilight_dict
 
 def get_buildlog_info(conn, settings, pkg, build_dict):
@@ -158,17 +218,17 @@ def get_buildlog_info(conn, settings, pkg, build_dict):
 	qa_error_list = []
 	repoman_error_list = []
 	sum_build_log_list = []
-	error_info_list = get error_info_list(conn)
+	error_info_list = get_error_info_list(conn)
 	for k, v in sorted(hilight_dict.iteritems()):
 		if v['startline'] == v['endline']:
 			error_log_list.append(logfile_text[k -1])
-			if v['hilight'] == "qa":
+			if v['hilight'] == "3": # qa = 3
 				qa_error_list.append(logfile_text[k -1])
 		else:
 			i = k
 			while i != (v['endline'] + 1):
 				error_log_list.append(logfile_text[i -1])
-				if v['hilight'] == "qa":
+				if v['hilight'] == "3": # qa = 3
 					qa_error_list.append(logfile_text[i -1])
 				i = i +1
 
@@ -178,8 +238,8 @@ def get_buildlog_info(conn, settings, pkg, build_dict):
 		sum_build_log_list.append("1") # repoman = 1
 	if qa_error_list != []:
 		sum_build_log_list.append("2") # qa = 2
-	for sum_log_line in sum_build_log_list
-		if re.search(^ \\* ERROR: , sum_log_line):
+	for sum_log_line in sum_build_log_list:
+		if re.search("ERROR: ", sum_log_line):
 			for error_info in error_info_list:
 				if re.search(error_info['error_search'], sum_log_line):
 					sum_build_log_list.append(error_info['error_id'])
@@ -202,28 +262,28 @@ def write_msg_file(msg, log_path):
 	if log_path is not None:
 		try:
 			f = open(_unicode_encode(log_path,
-					encoding=_encodings['fs'], errors='strict'),
-					mode='ab')
+			    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)
+		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()
+			f.write(_unicode_encode(msg))
+			f.close()
+			if f_real is not f:
+				f_real.close()
 
-def add_buildlog_main(settings, pkg):
+def add_buildlog_main(settings, pkg, trees):
 	CM = connectionManager()
 	conn = CM.newConnection()
 	if not conn.is_connected() is True:
@@ -257,17 +317,25 @@ def add_buildlog_main(settings, pkg):
 	add_gobs_logs(conn, log_msg, "info", config_id)
 	log_id = add_new_buildlog(conn, build_dict, build_log_dict)
 
-	msg = ""
-	# emerge_info_logfilename = settings.get("PORTAGE_LOG_FILE")[:-3] + "emerge_log.log"
 	if log_id is None:
-		# os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664)
 		log_msg = "Package %s:%s is NOT logged." % (pkg.cpv, pkg.repo,)
 		add_gobs_logs(conn, log_msg, "info", config_id)
 	else:
-		# for msg_line in msg:
-		#	write_msg_file(msg_line, emerge_info_logfilename)
+		args = []
+		args.append("--info")
+		args.append("=%s" % pkg.cpv)
+		myaction, myopts, myfiles = parse_opts(args, silent=True)
+		emerge_info_list = action_info(settings, trees, myopts, myfiles)
+		emerge_info = ""
+		e_info_hash = hashlib.sha256()
+		for e_info in emerge_info_list:
+			emerge_info = emerge_info + e_info
+			e_info_hash.update(e_info)
+		e_info_id = add_e_info(conn, log_id, emerge_info, e_info_hash)
+		if not e_info_id is None:
+			log_msg = "New Emerge --info is logged."
+			add_gobs_logs(conn, log_msg, "info", config_id)
 		os.chmod(settings.get("PORTAGE_LOG_FILE"), 0o664)
-		# os.chmod(emerge_info_logfilename, 0o664)
 		log_msg = "Package: %s:%s is logged." % (pkg.cpv, pkg.repo,)
 		add_gobs_logs(conn, log_msg, "info", config_id)
 		print("\n>>> Logging %s:%s\n" % (pkg.cpv, pkg.repo,))
@@ -286,7 +354,7 @@ def log_fail_queru(conn, build_dict, settings):
 		print('fail_querue_dict', fail_querue_dict)
 		add_fail_querue_dict(conn, fail_querue_dict)
 	else:
-		if fail_querue_dict['fail_times'] < 6:
+		if fail_querue_dict['fail_times'] < 3:
 			fail_querue_dict['fail_times'] = fail_querue_dict['fail_times']+ 1
 			fail_querue_dict['build_job_id'] = build_dict['build_job_id']
 			fail_querue_dict['fail_type'] = build_dict['type_fail']
@@ -298,7 +366,7 @@ def log_fail_queru(conn, build_dict, settings):
 			qa_error_list = []
 			repoman_error_list = []
 			sum_build_log_list = []
-			sum_build_log_list.append("True")
+			sum_build_log_list.append("2")
 			error_log_list.append(build_dict['type_fail'])
 			build_log_dict['repoman_error_list'] = repoman_error_list
 			build_log_dict['qa_error_list'] = qa_error_list

diff --git a/gobs/pym/manifest.py b/gobs/pym/manifest.py
index 20a4aeb..91a7c51 100644
--- a/gobs/pym/manifest.py
+++ b/gobs/pym/manifest.py
@@ -115,7 +115,8 @@ class gobs_manifest(object):
 		except:
 			self._mysettings.lock()
 			return "Can't fetch the file."
-		self._mysettings.lock()
+		finally:
+			self._mysettings.lock()
 		try:
 			my_manifest.checkCpvHashes(cpv, checkDistfiles=True, onlyDistfiles=False, checkMiscfiles=True)
 		except:
@@ -124,4 +125,4 @@ class gobs_manifest(object):
 			portdb.fetch_check(cpv, useflags=build_use_flags_list, mysettings=self._mysettings, all=False)
 		except:	
 			return "Fetch check failed."
-		return None
\ No newline at end of file
+		return
\ No newline at end of file

diff --git a/gobs/pym/mysql_querys.py b/gobs/pym/mysql_querys.py
index dfd423a..b5c2953 100644
--- a/gobs/pym/mysql_querys.py
+++ b/gobs/pym/mysql_querys.py
@@ -156,6 +156,31 @@ def add_new_manifest_sql(connection, cp, repo):
 	cursor.close()
 	return package_id
 
+def get_package_metadata_sql(connection, package_id):
+	cursor = connection.cursor()
+	sqlQ ='SELECT checksum FROM packages_metadata WHERE package_id = %s'
+	cursor.execute(sqlQ, (package_id,))
+	entries = cursor.fetchone()
+	cursor.close()
+	if not entries is None:
+		return entries[0]
+	return None
+
+def update_package_metadata((connection, package_metadataDict):
+	cursor = connection.cursor()
+	sqlQ1 ='SELECT package_id FROM packages_metadata WHERE package_id = %s'
+	sqlQ2 = 'UPDATE packages_metadata SET checksum = %s, email = %s, active = %s WHERE package_id = %s'
+	sqlQ3 = 'INSERT INTO packages_metadata (checksum, email, package_id) VALUES ( %s, %s, %s )'
+	for k, v in package_metadataDict.iteritems():
+		cursor.execute(sqlQ1, (k,))
+		entries = cursor.fetchone()
+		if not entries is None:
+			cursor.execute(sqlQ2, (v['metadata_xml_checksum'], v['metadata_xml_email'][0], k,))
+		else:
+			cursor.execute(sqlQ3, (v['metadata_xml_checksum'], v['metadata_xml_email'][0], k,))
+	connection.commit()
+	cursor.close()
+	
 def get_restriction_id(connection, restriction):
 	cursor = connection.cursor()
 	sqlQ ='SELECT restriction_id FROM restrictions WHERE restriction = %s'
@@ -499,10 +524,14 @@ def get_ebuild_id_db_checksum(connection, build_dict):
 	cursor = connection.cursor()
 	sqlQ = "SELECT ebuild_id FROM ebuilds WHERE version = %s AND checksum = %s AND package_id = %s AND active = 'True'"
 	cursor.execute(sqlQ, (build_dict['ebuild_version'], build_dict['checksum'], build_dict['package_id']))
-	ebuild_id = cursor.fetchone()
+	ebuild_id_list = []
+	entries = cursor.fetchall()
 	cursor.close()
-	if not ebuild_id is None:
-		return ebuild_id[0]
+	if entries != []:
+		for ebuild_id in entries:
+			ebuild_id_list.append(ebuild_id[0])
+		return ebuild_id_list
+
 
 def get_build_job_id(connection, build_dict):
 	cursor = connection.cursor()
@@ -547,9 +576,9 @@ def get_hilight_info(connection):
 		hilight.append(aadict)
 	return hilight
 
-def get error_info_list(connection):
+def get_error_info_list(connection):
 	cursor = connection.cursor()
-	sqlQ = 'SELECT error_id, error_name, error_search FROM error'
+	sqlQ = 'SELECT error_id, error_name, error_search FROM errors_info'
 	cursor.execute(sqlQ)
 	entries = cursor.fetchall()
 	cursor.close()
@@ -650,3 +679,25 @@ def add_new_buildlog(connection, build_dict, build_log_dict):
 		del_old_build_jobs(connection, build_dict['build_job_id'])
 		cursor.close()
 		return build_log_id
+
+def add_e_info(connection, log_id, emerge_info, e_info_hash):
+	cursor = connection.cursor()
+	sqlQ1 = 'SELECT einfo_id FROM emerge_info WHERE checksum = %s'
+	sqlQ2 = 'UPDATE build_logs SET einfo_id = %s WHERE build_log_id = %s'
+	sqlQ3 ='INSERT INTO emerge_info (checksum, emerge_info_text) VALUES (%s, %s)'
+	sqlQ4 = 'SELECT LAST_INSERT_ID()'
+	cursor.execute(sqlQ1, (e_info_hash,))
+	entries = cursor.fetchall()
+	if entries != []:
+		cursor.execute(sqlQ2, (entries[0],))
+		connection.commit()
+		cursor.close()
+		return None
+	cursor.execute(sqlQ3, (e_info_hash, emerge_info,))
+	cursor.execute(sqlQ4)
+	entries = cursor.fetchall()
+	cursor.execute(sqlQ2, (entries[0],))
+	connection.commit()
+	cursor.close()
+	return entries[0]
+

diff --git a/gobs/pym/package.py b/gobs/pym/package.py
index 7c37f7c..12f1afa 100644
--- a/gobs/pym/package.py
+++ b/gobs/pym/package.py
@@ -1,5 +1,6 @@
 from __future__ import print_function
 import portage
+from portage.xml.metadata import MetaDataXML
 from gobs.flags import gobs_use_flags
 from gobs.manifest import gobs_manifest
 from gobs.text import get_ebuild_cvs_revision
@@ -153,22 +154,27 @@ class gobs_package(object):
 						add_gobs_logs(self._conn, log_msg, "info", self._config_id)
 					i = i +1
 
-	def get_package_metadataDict(self, pkgdir, package):
+	def get_package_metadataDict(self, pkgdir, package_id):
 		# Make package_metadataDict
 		attDict = {}
 		package_metadataDict = {}
-		changelog_checksum_tree = portage.checksum.sha256hash(pkgdir + "/ChangeLog")
-		changelog_text_tree = get_file_text(pkgdir + "/ChangeLog")
-		metadata_xml_checksum_tree = portage.checksum.sha256hash(pkgdir + "/metadata.xml")
-		metadata_xml_text_tree = get_file_text(pkgdir + "/metadata.xml")
-		attDict['changelog_checksum'] =  changelog_checksum_tree[0]
-		attDict['changelog_text'] =  changelog_text_tree
-		attDict['metadata_xml_checksum'] =  metadata_xml_checksum_tree[0]
-		attDict['metadata_xml_text'] =  metadata_xml_text_tree
-		package_metadataDict[package] = attDict
+		# changelog_checksum_tree = portage.checksum.sha256hash(pkgdir + "/ChangeLog")
+		# changelog_text_tree = get_file_text(pkgdir + "/ChangeLog")
+		pkg_md = MetaDataXMLpkgdir + "/metadata.xml")
+		#metadata_xml_text_tree = get_file_text(pkgdir + "/metadata.xml")
+		# attDict['changelog_checksum'] =  changelog_checksum_tree[0]
+		# attDict['changelog_text'] =  changelog_text_tree
+		# attDict['metadata_xml_herds'] = pkg_md.herds()
+		md_email_list = []
+		for maint in pkg_md.maintainers():
+			md_email_list.append(maint.email)
+	  	attDict['metadata_xml_email'] = md_email_list
+		attDict['metadata_xml_checksum'] =  portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0]
+		#attDict['metadata_xml_text'] =  metadata_xml_text_tree
+		package_metadataDict[package_id] = attDict
 		return package_metadataDict
 
-	def add_package(self, packageDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree):
+	def add_package(self, packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree):
 		# Use packageDict to update the db
 		ebuild_id_list = add_new_ebuild_sql(self._conn, package_id, packageDict)
 		
@@ -182,6 +188,10 @@ class gobs_package(object):
 		if not old_ebuild_id_list == []:
 			add_old_ebuild(self._conn, package_id, old_ebuild_id_list)
 
+		package_metadata_checksum_sql = get_package_metadata_sql(self._conn, package_id)
+		if package_metadata_checksum_sql is None or package_metadata_checksum_sql != package_metadataDict['package_id']['metadata_xml_checksum']:
+			update_package_metadata(self._conn, package_metadataDict)
+
 		# update the cp manifest checksum
 		update_manifest_sql(self._conn, package_id, manifest_checksum_tree)
 
@@ -215,7 +225,8 @@ class gobs_package(object):
 			add_gobs_logs(self._conn, log_msg, "info", self._config_id)
 			return
 		package_id = add_new_manifest_sql(self._conn, cp, repo)
-
+		
+		package_metadataDict = get_package_metadataDict(self, pkgdir, package_id)
 		# Get the ebuild list for cp
 		mytree = []
 		mytree.append(repodir)
@@ -234,7 +245,7 @@ class gobs_package(object):
 		for cpv in sorted(ebuild_list_tree):
 			packageDict[cpv] = self.get_packageDict(pkgdir, cpv, repo)
 
-		self.add_package(packageDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
+		self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
 		log_msg = "C %s:%s ... Done." % (cp, repo)
 		add_gobs_logs(self._conn, log_msg, "info", self._config_id)
 
@@ -318,8 +329,8 @@ class gobs_package(object):
 					# Remove cpv from packageDict and add ebuild to new ebuils list
 					del packageDict[cpv]
 					new_ebuild_id_list.append(get_ebuild_id_db(self._conn, ebuild_version_checksum_tree, package_id)[0])
-
-			self.add_package(packageDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
+			package_metadataDict = get_package_metadataDict(self, pkgdir, package_id)
+			self.add_package(packageDict, package_metadataDict, package_id, new_ebuild_id_list, old_ebuild_id_list, manifest_checksum_tree)
 
 		log_msg = "C %s:%s ... Done." % (cp, repo)
 		add_gobs_logs(self._conn, log_msg, "info", self._config_id)