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 1Qmysh-0000hK-DB for garchives@archives.gentoo.org; Sat, 30 Jul 2011 02:02:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06EB121C11D for ; Sat, 30 Jul 2011 02:02:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DD54621C3C4 for ; Sat, 30 Jul 2011 01:07:34 +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 586841B401B for ; Sat, 30 Jul 2011 01:07:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id ADDF68003F for ; Sat, 30 Jul 2011 01:07:33 +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: <158790911ebb653146079c19a4d25a7386e0e4d0.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/gobs_updatedb gobs/bin/portage_hooks X-VCS-Directories: gobs/bin/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 158790911ebb653146079c19a4d25a7386e0e4d0 Date: Sat, 30 Jul 2011 01:07:33 +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: 7c13d5878004441fc5ac2c6b3c79bb84 commit: 158790911ebb653146079c19a4d25a7386e0e4d0 Author: Magnus Granberg gentoo org> AuthorDate: Sat Jul 30 01:07:13 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Sat Jul 30 01:07:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3D15879091 Move pgsql.py part2 --- gobs/bin/gobs_buildquerys | 4 +--- gobs/bin/gobs_updatedb | 14 ++++++-------- gobs/bin/portage_hooks | 4 +--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/gobs/bin/gobs_buildquerys b/gobs/bin/gobs_buildquerys index 87f1218..7b8121b 100755 --- a/gobs/bin/gobs_buildquerys +++ b/gobs/bin/gobs_buildquerys @@ -9,9 +9,7 @@ from gobs.ConnectionManager import connectionManager CM=3DconnectionManager(gobs_settings_dict) #selectively import the pgsql/mysql querys if CM.getName()=3D=3D'pgsql': - from gobs.querys.pgsql import * -elif CM.getName()=3D=3D'mysql': - from gobs.querys.mysql import * + from gobs.pgsql import * =20 from gobs.check_setup import check_configure_guest from gobs.build_queru import queruaction diff --git a/gobs/bin/gobs_updatedb b/gobs/bin/gobs_updatedb index d2ff779..a9c8e4a 100755 --- a/gobs/bin/gobs_updatedb +++ b/gobs/bin/gobs_updatedb @@ -18,9 +18,7 @@ from gobs.ConnectionManager import connectionManager CM=3DconnectionManager(gobs_settings_dict) #selectively import the pgsql/mysql querys if CM.getName()=3D=3D'pgsql': - from gobs.querys.pgsql import * -elif CM.getName()=3D=3D'mysql': - from gobs.querys.mysql import * + from gobs.pgsql import * =20 from gobs.check_setup import check_make_conf from gobs.arch import gobs_arch @@ -53,7 +51,7 @@ def init_portage_settings(CM, gobs_settings_dict): print "Setting default config to:", config_id[0] return mysettings =20 -def update_cpv_db(mysettings, CM, gobs_settings_dict): +def update_cpv_db(mysettings, gobs_settings_dict): """Code to update the cpv in the database. @type:settings @parms: portage.settings @@ -65,9 +63,9 @@ def update_cpv_db(mysettings, CM, gobs_settings_dict): print "Checking categories, package, ebuilds" # Setup portdb, gobs_categories, gobs_old_cpv, package myportdb =3D portage.portdbapi(mysettings=3Dmysettings) - init_categories =3D gobs_categories(CM, mysettings) - init_old_cpv =3D gobs_old_cpv(CM, myportdb, mysettings) - init_package =3D gobs_package(mysettings, CM, myportdb, gobs_settings_d= ict) + init_categories =3D gobs_categories(mysettings) + init_old_cpv =3D gobs_old_cpv(myportdb, mysettings) + init_package =3D gobs_package(mysettings, myportdb, gobs_settings_dict) package_id_list_tree =3D [] # Will run some update checks and update package if needed # Get categories/package list from portage @@ -107,7 +105,7 @@ def main(): init_arch =3D gobs_arch(CM) init_arch.update_arch_db() # Update the cpv db - update_cpv_db(mysettings, CM, gobs_settings_dict) + update_cpv_db(mysettings, gobs_settings_dict) CM.closeAllConnections() =09 if __name__ =3D=3D "__main__": diff --git a/gobs/bin/portage_hooks b/gobs/bin/portage_hooks index bdb1699..41321df 100755 --- a/gobs/bin/portage_hooks +++ b/gobs/bin/portage_hooks @@ -11,9 +11,7 @@ from gobs.ConnectionManager import connectionManager CM=3DconnectionManager(gobs_settings_dict) #selectively import the pgsql/mysql querys if CM.getName()=3D=3D'pgsql': - from gobs.querys.pgsql import * -elif CM.getName()=3D=3D'mysql': - from gobs.querys.mysql import * + from gobs.pgsql import * =20 from gobs.package import gobs_package from gobs.build_log import gobs_buildlog