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 1Qmp2E-00012I-T5 for garchives@archives.gentoo.org; Fri, 29 Jul 2011 15:31:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B17C821C02D; Fri, 29 Jul 2011 15:31:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 63A8121C02D for ; Fri, 29 Jul 2011 15:31:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF7551B4016 for ; Fri, 29 Jul 2011 15:31:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 24F8D8003D for ; Fri, 29 Jul 2011 15:31:14 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <467f8f50912235c3ea0be555f98abd394e3ece93.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/bin/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/bin/gobs_buildquerys gobs/bin/portage_hooks X-VCS-Directories: gobs/bin/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 467f8f50912235c3ea0be555f98abd394e3ece93 Date: Fri, 29 Jul 2011 15:31:14 +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: b5bd2da7797f5cc2502fb6bbd5dcb00d commit: 467f8f50912235c3ea0be555f98abd394e3ece93 Author: Magnus Granberg gentoo org> AuthorDate: Fri Jul 29 15:16:53 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Fri Jul 29 15:16:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D467f8f50 Updated the bins --- gobs/bin/gobs_buildquerys | 144 +--------------------------------------= ----- gobs/bin/portage_hooks | 41 +++++++------ 2 files changed, 26 insertions(+), 159 deletions(-) diff --git a/gobs/bin/gobs_buildquerys b/gobs/bin/gobs_buildquerys index bc7e320..87f1218 100755 --- a/gobs/bin/gobs_buildquerys +++ b/gobs/bin/gobs_buildquerys @@ -14,160 +14,24 @@ elif CM.getName()=3D=3D'mysql': from gobs.querys.mysql import * =20 from gobs.check_setup import check_configure_guest -from gobs.flags import gobs_use_flags -from gobs.manifest import gobs_manifest -from _emerge.main import emerge_main +from gobs.build_queru import queruaction import portage import sys import os =20 -def log_qa_error(connection, build_dict, what_error, fail_error, config_= id): - ebuild_id_list =3D [] - qa_error_list =3D [] - repoman_error =3D [] - ebuild_version =3D build_dict['ebuild_version'] - attDict =3D {} - packageDict =3D {} - attDict['ebuild_error'] =3D repoman_error - packageDict[ebuild_version] =3D attDict - qa_error_list.append(fail_error) - fail_times =3D check_fail_times(connection, build_dict['queue_id'], wha= t_error) - if fail_times is None: - add_fail_times(connection, build_dict['queue_id'], what_error) - else: - if fail_times[0] > 5: - return - elif fail_times[0] =3D=3D 5: - ebuild_id_list.append(build_dict['ebuild_id']) - add_qa_repoman(connection, ebuild_id_list, qa_error_list, packageDict= , config_id) - del_old_queue(connection, build_dict['queue_id']) - return - update_fail_times(connection, build_dict['queue_id'], what_error, fail= _times[0]) - -def get_cpv_build_list(connection, build_dict, config_profile): - build_cpv_dict =3D {} - cpv_dict =3D {} - cpv_list =3D "1" - mysettings =3D portage.settings - #myportdb =3D portage.portdbapi(mysettings=3Dmysettings) - myportdb =3D portage.portdb - #porttree =3D portage.portagetree(settings=3Dmysettings) - #trees =3D {"/" : {"porttree":porttree}} - #dep_keys =3D ("DEPEND", "RDEPEND", "PDEPEND") - pkgdir =3D os.path.join(mysettings['PORTDIR'], build_dict['categories']= + "/" + build_dict['package']) - init_manifest =3D gobs_manifest(mysettings, pkgdir) - try: - ebuild_version_checksum_tree =3D portage.checksum.sha256hash(pkgdir+ "= /" + build_dict['package'] + "-" + build_dict['ebuild_version'] + ".ebuil= d")[0] - except: - ebuild_version_checksum_tree =3D None - print ebuild_version_checksum_tree, build_dict['ebuild_checksum'] - ebuild_version_checksum_db =3D have_activ_ebuild_id(connection, build_d= ict['ebuild_id']) - print 'ebuild_version_checksum_db', ebuild_version_checksum_db - if ebuild_version_checksum_db is None: - print "queue_id don't have active ebuild_id" - del_old_queue(connection, build_dict['queue_id']) - return None - if ebuild_version_checksum_tree !=3D build_dict['ebuild_checksum']: - new_queue_id =3D check_revision(connection, build_dict, config_profile= , ebuild_version_checksum_tree) - if new_queue_id is None: - return None - # FIXME use log_qa_error() - if check_fail_times(build_dict['queue_id'], "cpv_checksum") is False: - update_fail_times(build_dict['queue_id'], "cpv_checksum") - else: - add_cpv_fail(build_dict['queue_id'], "cpv_checksum") - return None - build_dict =3D get_package_to_build(connection,config_profile, new_que= ue_id) - categories =3D build_dict['categories'] - package =3D build_dict['package'] - ebuild_version =3D build_dict['ebuild_version'] - ebuild_version_useflags =3D build_dict['build_useflags'] - build_massage =3D build_dict['post_message'] - cpv =3D unicode(categories + "/" + package + "-" + ebuild_version) - cp =3D unicode(categories + "/" + package) - init_flags =3D gobs_use_flags(mysettings, myportdb, cpv) - #mysettings['O'] =3D pkgdir - print portage.getmaskingstatus(cpv, settings=3Dmysettings, portdb=3Dmyp= ortdb) - if portage.getmaskingstatus(cpv, settings=3Dmysettings, portdb=3Dmyport= db) !=3D []: - # FIXME use log_qa_error() - if check_fail_times(build_dict['queue_id'], "cpv_mask") is False: - update_fail_times(build_dict['queue_id'], "cpv_mask") - else: - add_cpv_fail(build_dict['queue_id'], "cpv_mask") - return None - build_use_flags_list =3D init_flags.comper_useflags(build_dict) - manifest_error =3D init_manifest.check_file_in_manifest(myportdb, cpv, = build_dict, build_use_flags_list) - print 'manifest_error', manifest_error - if manifest_error is not None: - what_error =3D "cpv_manifest" - log_qa_error(connection, build_dict, what_error, manifest_error, confi= g_profile) - return None - build_cpv_dict =3D init_flags.get_needed_dep_useflags(build_use_flags_l= ist) - print build_cpv_dict, build_use_flags_list, cpv - build_use_flags_dict =3D {} - if build_use_flags_list is None: - build_use_flags_dict['None'] =3D None - if build_cpv_dict is None: - build_cpv_dict =3D {} - build_cpv_dict[cpv] =3D build_use_flags_dict - else: - build_cpv_dict[cpv] =3D build_use_flags_dict - print build_cpv_dict - return build_cpv_dict - =09 def main_loop(CM, config_profile): repeat =3D True - new =3D False - queue_id_list =3D 43280 #get a connection from the pool conn=3DCM.getConnection() + init_queru =3D queruaction(config_profile) + fail_querue_dict =3D {} while repeat: - build_cpv_dict =3D {} - build_dict =3D {} if check_configure_guest(conn, config_profile) is not True: # time.sleep(60) continue # retunr to the start of the function else: - build_dict =3D get_package_to_build(conn,config_profile, queue_id_lis= t, new) - print "build_dict['ebuild_id'] build_dict['post_message']", build_dic= t['ebuild_id'], build_dict['post_message'] - if build_dict['ebuild_id'] is None: - if build_dict['post_message'] is None: - # time.sleep(60) - print "build_dict none" - queue_id_list =3D queue_id_list + 1 - print queue_id_list - continue # return to the start of the function - build_cpv_dict =3D get_cpv_build_list(conn, build_dict, config_profil= e) - if build_cpv_dict is None: - queue_id_list =3D queue_id_list + 1 - continue # return to the start of the function - build_cpv_list =3D [] - for k, v in build_cpv_dict.iteritems(): - build_use_flags_list =3D [] - for x, y in v.iteritems(): - if y is True: - build_use_flags_list.append(x) - if y is False: - build_use_flags_list.append("-" + x) - print k, build_use_flags_list - if build_use_flags_list =3D=3D []: - build_cpv_list.append("=3D" + k) - else: - build_use_flags =3D "" - for flags in build_use_flags_list: - build_use_flags =3D build_use_flags + flags + "," - build_cpv_list.append("=3D" + k + "[" + build_use_flags + "]") - print build_cpv_list - argscmd =3D [] - # argscmd.append("--buildpkg") - # argscmd.append("--usepkg") - argscmd.append("--oneshot") - for build_cpv in build_cpv_list: - argscmd.append(build_cpv) - print argscmd - emerge_main(args=3Dargscmd) + fail_querue_list =3D init_queru.procces_qureru(fail_querue_dict) sys.exit() - queue_id_list =3D queue_id_list + 1 CM.putConnection(conn) =20 def main(): diff --git a/gobs/bin/portage_hooks b/gobs/bin/portage_hooks index 97c2576..bdb1699 100755 --- a/gobs/bin/portage_hooks +++ b/gobs/bin/portage_hooks @@ -1,5 +1,7 @@ #!/usr/bin/python - +from __future__ import print_function +import os +import sys # Get the options from the config file set in gobs.readconf from gobs.readconf import get_conf_settings reader=3Dget_conf_settings() @@ -16,10 +18,10 @@ elif CM.getName()=3D=3D'mysql': from gobs.package import gobs_package from gobs.build_log import gobs_buildlog from gobs.flags import gobs_use_flags +from portage.util import writemsg, writemsg_level, writemsg_stdout import portage -import os =20 -def get_build_dict_db(CM, mysettings, config_profile, gobs_settings_dict= ): +def get_build_dict_db(mysettings, config_profile, gobs_settings_dict): conn=3DCM.getConnection() myportdb =3D portage.portdbapi(mysettings=3Dmysettings) categories =3D os.environ['CATEGORY'] @@ -27,9 +29,9 @@ def get_build_dict_db(CM, mysettings, config_profile, g= obs_settings_dict): ebuild_version =3D os.environ['PVR'] cpv =3D categories + "/" + package + "-" + ebuild_version init_package =3D gobs_package(mysettings, CM, myportdb, gobs_settings_d= ict) - print "cpv", cpv + print("cpv", cpv) package_id =3D have_package_db(conn, categories, package) - print "package_id", package_id + # print("package_id %s" % package_id, file=3Dsys.stdout) build_dict =3D {} mybuild_dict =3D {} build_dict['ebuild_version'] =3D ebuild_version @@ -40,37 +42,38 @@ def get_build_dict_db(CM, mysettings, config_profile,= gobs_settings_dict): build_dict['config_profile'] =3D config_profile init_useflags =3D gobs_use_flags(mysettings, myportdb, cpv) iuse_flags_list, final_use_list =3D init_useflags.get_flags_looked() - print 'final_use_list', final_use_list + #print 'final_use_list', final_use_list if final_use_list !=3D []: build_dict['build_useflags'] =3D final_use_list else: build_dict['build_useflags'] =3D None - print "build_dict['build_useflags']", build_dict['build_useflags'] + #print "build_dict['build_useflags']", build_dict['build_useflags'] pkgdir =3D os.path.join(mysettings['PORTDIR'], categories + "/" + packa= ge) ebuild_version_checksum_tree =3D portage.checksum.sha256hash(pkgdir+ "/= " + package + "-" + ebuild_version + ".ebuild")[0] build_dict['checksum'] =3D ebuild_version_checksum_tree - print 'checksum' ,ebuild_version_checksum_tree + print('checksum' ,ebuild_version_checksum_tree) ebuild_id =3D get_ebuild_id_db_checksum(conn, build_dict) - print 'ebuild_id in db', ebuild_id + print('ebuild_id in db', ebuild_id) if ebuild_id is None: - print 'have any ebuild', get_ebuild_checksum(conn, package_id, ebuild= _version) + #print 'have any ebuild', get_ebuild_checksum(conn, package_id, ebuil= d_version) init_package.update_ebuild_db(build_dict) - queue_id =3D check_revision(conn, build_dict, config_profile, ebuild_ve= rsion_checksum_tree) - print "queue_id", queue_id + ebuild_id =3D get_ebuild_id_db_checksum(conn, build_dict) + build_dict['ebuild_id'] =3D ebuild_id + queue_id =3D check_revision(conn, build_dict) + print("queue_id in db", queue_id) if queue_id is None: - init_package.add_new_ebuild_buildquery_db_looked(build_dict, config_pr= ofile) - queue_id =3D check_revision(conn, build_dict, config_profile, ebuild_v= ersion_checksum_tree) - mybuild_dict =3D get_package_to_build(conn, config_profile, queue_id, n= ew =3D True) - print 'mybuild_dict', mybuild_dict - return mybuild_dict + build_dict['queue_id'] =3D None + else: + build_dict['queue_id'] =3D queue_id + return build_dict =20 def main(): # Main config_profile =3D gobs_settings_dict['gobs_config'] #we provide the main_loop with the ConnectionManager so we can hand ou= t connections from within the loop mysettings =3D portage.settings - build_dict =3D get_build_dict_db(CM, mysettings, config_profile, gobs_= settings_dict) - init_buildlog =3D gobs_buildlog(CM ,mysettings, build_dict, config_pro= file) + build_dict =3D get_build_dict_db( mysettings, config_profile, gobs_set= tings_dict) + init_buildlog =3D gobs_buildlog(mysettings, build_dict) init_buildlog.add_buildlog_main() #connectionManager.closeAllConnections() =20