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 1RKzTO-0001fk-Id for garchives@archives.gentoo.org; Mon, 31 Oct 2011 21:32:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEB8EE0486; Mon, 31 Oct 2011 21:32:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7CA94E0486 for ; Mon, 31 Oct 2011 21:32:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6D421B4027 for ; Mon, 31 Oct 2011 21:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 29C8E80042 for ; Mon, 31 Oct 2011 21:32:41 +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: Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/init_setup_profile.py gobs/pym/package.py gobs/pym/pgsql.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: d0d469c1afdab7795b97dccf02272bd6fc997611 Date: Mon, 31 Oct 2011 21:32:41 +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: 2c7a1954-a5f7-47c1-b1ff-0b5eb56b82f7 X-Archives-Hash: ced461af63c3ede29d27c43a314eef53 commit: d0d469c1afdab7795b97dccf02272bd6fc997611 Author: Magnus Granberg gentoo org> AuthorDate: Mon Oct 31 21:32:12 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Mon Oct 31 21:32:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3Dd0d469c1 fix bugs in gobs_setup_profile --- gobs/pym/init_setup_profile.py | 47 +++++++++++++++++++++++-----------= ------ gobs/pym/package.py | 33 ++++++++++++--------------- gobs/pym/pgsql.py | 17 ++++++++------ 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/init_setup_profile= .py index cc799cb..e647e1f 100644 --- a/gobs/pym/init_setup_profile.py +++ b/gobs/pym/init_setup_profile.py @@ -48,32 +48,39 @@ def setup_profile_main(args=3DNone): config_id_list =3D [] config_id_list.append(config_id) for package_line in sorted(package_list_tree): - build_dict =3D {} - packageDict =3D {} - ebuild_id_list =3D [] - # split the cp to categories and package - element =3D package_line.split('/') - categories =3D element[0] - package =3D element[1] - print "C", categories + "/" + package # C =3D Checking - pkgdir =3D mysettings['PORTDIR'] + "/" + categories + "/" + package - config_cpv_listDict =3D init_package.config_match_ebuild(categories,= package, config_id_list) - if config_cpv_listDict !=3D {}: - packageDict['ebuild_version_tree'] =3D config_cpv_listDict['ebuild_= version'] - build_dict['checksum'] =3D portage.checksum.sha256hash(pkgdir + "/"= + package + "-" + config_cpv_listDict['ebuild_version'] + ".ebuild")[0] - build_dict['package_id'] =3D have_package_db(categories, package) - build_dict['ebuild_version'] =3D config_cpv_listDict['ebuild_versio= n'] - ebuild_id =3D get_ebuild_id_db_checksum(connection, build_dict) - if ebuild_id is not None: - ebuild_id_list.append(ebuild_id) - init_package.add_new_ebuild_buildquery_db(ebuild_id_list, packageD= ict, config_cpv_listDict) + # FIXME: remove the check for gobs when in tree + if package_line !=3D "dev-python/gobs": + build_dict =3D {} + packageDict =3D {} + ebuild_id_list =3D [] + # split the cp to categories and package + element =3D package_line.split('/') + categories =3D element[0] + package =3D element[1] + print "C", categories + "/" + package # C =3D Checking + pkgdir =3D mysettings['PORTDIR'] + "/" + categories + "/" + package + config_cpv_listDict =3D init_package.config_match_ebuild(categories= , package, config_id_list) + if config_cpv_listDict !=3D {}: + cpv =3D categories + "/" + package + "-" + config_cpv_listDict[con= fig_id]['ebuild_version'] + attDict =3D {} + attDict['categories'] =3D= categories + attDict['package'] =3D p= ackage + attDict['ebuild_version_= tree'] =3D config_cpv_listDict[config_id]['ebuild_version'] + packageDict[cpv] =3D att= Dict + build_dict['checksum'] =3D portage.checksum.sha256hash(pkgdir + "/= " + package + "-" + config_cpv_listDict[config_id]['ebuild_version'] + ".= ebuild")[0] + build_dict['package_id'] =3D have_package_db(conn, categories, pac= kage)[0] + build_dict['ebuild_version'] =3D config_cpv_listDict[config_id]['e= build_version'] + ebuild_id =3D get_ebuild_id_db_checksum(conn, build_dict) + if ebuild_id is not None: + ebuild_id_list.append(ebuild_id) + init_package.add_new_ebuild_buildquery_db(ebuild_id_list, package= Dict, config_cpv_listDict) =20 if args[0] =3D=3D "-del": config_id =3D args[1] querue_id_list =3D get_queue_id_list_config(conn, config_id) if querue_id_list is not None: for querue_id in querue_id_list: - del_old_queue(conn, queue_id) + del_old_queue(conn, querue_id) CM.putConnection(conn) =20 =09 \ No newline at end of file diff --git a/gobs/pym/package.py b/gobs/pym/package.py index b68d8f6..4f1f48f 100644 --- a/gobs/pym/package.py +++ b/gobs/pym/package.py @@ -28,15 +28,12 @@ class gobs_package(object): mysettings_setup =3D portage.config(config_root =3D my_new_setup) return mysettings_setup =20 - def config_match_ebuild(self, categories, package, config_list_all): - conn=3DCM.getConnection() + def config_match_ebuild(self, categories, package, config_list): config_cpv_listDict =3D{} - # Get a list from table configs/setups with default_config=3DFales and= active =3D True - config_list_all =3D get_config_list(conn) - if config_list_all is (): + if config_list =3D=3D []: return config_cpv_listDict - for i in config_list_all: - config_id =3D i[0] + conn=3DCM.getConnection() + for config_id in config_list: # Change config/setup mysettings_setup =3D self.change_config(config_id) myportdb_setup =3D portage.portdbapi(mysettings=3Dmysettings_setup) @@ -54,13 +51,13 @@ class gobs_package(object): for iuse_line in iuse_flags_list: iuse_flags_list2.append( init_useflags.reduce_flag(iuse_line)) # Dic the needed info - attDict =3D {} - attDict['ebuild_version'] =3D latest_ebuild_version - attDict['useflags'] =3D final_use_list - attDict['iuse'] =3D iuse_flags_list2 - attDict['package'] =3D package - attDict['categories'] =3D categories - config_cpv_listDict[config_id] =3D attDict + attDict =3D {} + attDict['ebuild_version'] =3D latest_ebuild_version + attDict['useflags'] =3D final_use_list + attDict['iuse'] =3D iuse_flags_list2 + attDict['package'] =3D package + attDict['categories'] =3D categories + config_cpv_listDict[config_id] =3D attDict # Clean some cache myportdb_setup.close_caches() portage.portdbapi.portdbapi_instances.remove(myportdb_setup) @@ -186,8 +183,8 @@ class gobs_package(object): ebuild_list_tree =3D self._myportdb.cp_list((categories + "/" + packag= e), use_cache=3D1, mytree=3DNone) if ebuild_list_tree =3D=3D []: return None - config_list_all =3D get_config_list(conn) - config_cpv_listDict =3D self.config_match_ebuild(categories, package, = config_list_all) + config_list =3D get_config_list(conn) + config_cpv_listDict =3D self.config_match_ebuild(categories, package, = config_list) config_id =3D get_default_config(conn) packageDict =3D{} for ebuild_line in sorted(ebuild_list_tree): @@ -237,8 +234,8 @@ class gobs_package(object): package_metadataDict =3D self.get_package_metadataDict(pkgdir, packag= e) update_new_package_metadata(conn,package_id, package_metadataDict) # Get config_cpv_listDict - config_list_all =3D get_config_list(conn) - config_cpv_listDict =3D self.config_match_ebuild(categories, package,= config_list_all) + config_list =3D get_config_list(conn) + config_cpv_listDict =3D self.config_match_ebuild(categories, package,= config_list) config_id =3D get_default_config(conn) packageDict =3D{} for ebuild_line in sorted(ebuild_list_tree): diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py index 1d7ee48..b0a6c83 100644 --- a/gobs/pym/pgsql.py +++ b/gobs/pym/pgsql.py @@ -88,7 +88,10 @@ def get_config_list(connection): if entries =3D=3D (): return None else: - return entries + config_id_list =3D [] + for config_id in entries: + config_id_list.append(config_id[0]) + return config_id_list =20 def get_config_list_all(connection): cursor =3D connection.cursor() @@ -284,10 +287,10 @@ def get_ebuild_id_db_checksum(connection, build_dic= t): cursor =3D connection.cursor() sqlQ =3D 'SELECT id FROM ebuilds WHERE ebuild_version =3D %s AND ebuild= _checksum =3D %s AND package_id =3D %s' cursor.execute(sqlQ, (build_dict['ebuild_version'], build_dict['checksu= m'], build_dict['package_id'])) - ebuild_id =3D sorted(cursor.fetchall()) - if ebuild_id is None: + ebuild_id_list =3D sorted(cursor.fetchall()) + if ebuild_id_list =3D=3D []: return None - return ebuild_id[0] + return ebuild_id_list[0] =20 def get_cpv_from_ebuild_id(connection, ebuild_id): cursor =3D connection.cursor() @@ -328,9 +331,9 @@ def have_package_buildqueue(connection, ebuild_id, co= nfig_id): =20 def get_queue_id_list_config(connection, config_id): cursor =3D connection.cursor() - sqlQ =3D 'SELECT queue_id FROM buildqueue WHERE config_id =3D %s' + sqlQ =3D 'SELECT queue_id FROM buildqueue WHERE config =3D %s' cursor.execute(sqlQ, (config_id,)) - entries =3D cursor.fetchoall() + entries =3D cursor.fetchall() return entries =20 def add_new_package_buildqueue(connection, ebuild_id, config_id, iuse_fl= ags_list, use_enable, message): @@ -434,7 +437,7 @@ def del_old_ebuild(connection, ebuild_old_list_db): sqlQ3 =3D 'DELETE FROM repoman_problems WHERE build_id =3D %s' sqlQ4 =3D 'DELETE FROM ebuildbuildwithuses WHERE build_id =3D %s' sqlQ5 =3D 'DELETE FROM ebuildhaveskeywords WHERE ebuild_id =3D %s' - sqlQ6 =3D 'DELETE FROM ebuildhavesiuses WHERE ebuild_id =3D %s' + sqlQ6 =3D 'DELETE FROM ebuildhavesiuses WHERE ebuild =3D %s' sqlQ7 =3D 'DELETE FROM ebuildhavesrestrictions WHERE ebuild_id =3D %s' sqlQ8 =3D 'DELETE FROM buildlog WHERE ebuild_id =3D %s' sqlQ9 =3D 'SELECT queue_id FROM buildqueue WHERE ebuild_id =3D %s'