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

[Magnus Granberg]

commit:     158790911ebb653146079c19a4d25a7386e0e4d0
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 01:07:13 2011 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 01:07:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=15879091

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=connectionManager(gobs_settings_dict)
 #selectively import the pgsql/mysql querys
 if CM.getName()=='pgsql':
-  from gobs.querys.pgsql import *
-elif CM.getName()=='mysql':
-  from gobs.querys.mysql import *
+  from gobs.pgsql import *
 
 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=connectionManager(gobs_settings_dict)
 #selectively import the pgsql/mysql querys
 if CM.getName()=='pgsql':
-  from gobs.querys.pgsql import *
-elif CM.getName()=='mysql':
-  from gobs.querys.mysql import *
+  from gobs.pgsql import *
 
 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
 
-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 = portage.portdbapi(mysettings=mysettings)
-	init_categories = gobs_categories(CM, mysettings)
-	init_old_cpv = gobs_old_cpv(CM, myportdb, mysettings)
-	init_package = gobs_package(mysettings, CM, myportdb, gobs_settings_dict)
+	init_categories = gobs_categories(mysettings)
+	init_old_cpv = gobs_old_cpv(myportdb, mysettings)
+	init_package = gobs_package(mysettings, myportdb, gobs_settings_dict)
 	package_id_list_tree = []
 	# Will run some update checks and update package if needed
 	# Get categories/package list from portage
@@ -107,7 +105,7 @@ def main():
 	init_arch = 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()
 	
 if __name__ == "__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=connectionManager(gobs_settings_dict)
 #selectively import the pgsql/mysql querys
 if CM.getName()=='pgsql':
-  from gobs.querys.pgsql import *
-elif CM.getName()=='mysql':
-  from gobs.querys.mysql import *
+  from gobs.pgsql import *
 
 from gobs.package import gobs_package
 from gobs.build_log import gobs_buildlog