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

[Magnus Granberg]

commit:     4493c3698b25fab4c0c6c497593752226c694503
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 15:55:38 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 15:55:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=4493c369

adding updatedb to job host deamon part3

---
 ebuild/dev-python/gobs/gobs-9999.ebuild      |   10 ++--------
 gobs/bin/gobs_host_jobs                      |    1 +
 gobs/bin/{gobs_host_jobs => gobs_host_jobs~} |    0
 gobs/pym/sync.py                             |    8 ++++----
 gobs/pym/{sync.py => sync.py~}               |    8 ++++----
 gobs/pym/updatedb.py                         |    7 ++++---
 gobs/pym/{updatedb.py => updatedb.py~}       |    7 ++++---
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ebuild/dev-python/gobs/gobs-9999.ebuild b/ebuild/dev-python/gobs/gobs-9999.ebuild
index 5430529..1a6fc3d 100644
--- a/ebuild/dev-python/gobs/gobs-9999.ebuild
+++ b/ebuild/dev-python/gobs/gobs-9999.ebuild
@@ -26,12 +26,6 @@ DEPEND="${RDEPEND}
 # RESTRICT_PYTHON_ABIS="3.*"
 
 EGIT_REPO_URI="http://git.overlays.gentoo.org/gitroot/dev/zorry.git"
-#EGIT_FETCH_CMD="git clone"
-##EGIT_BRANCH="master"
-##EGIT_COMMIT=${EGIT_BRANCH}
-# The eclass is based on subversion eclass.
-# If you use this eclass, the ${S} is ${WORKDIR}/${P}.
-# It is necessary to define the EGIT_REPO_URI variable at least.
 
 PYTHON_MODNAME="gobs"
 
@@ -40,9 +34,9 @@ src_install() {
 	dodir etc/gobs || die
 	insinto /etc/gobs
 	doins ${FILESDIR}/gobs.conf || die
-	dobin ${S}/gobs/bin/gobs_updatedb || die
+	dobin ${S}/gobs/sbin/gobs_host_jobs || die
 	dobin ${S}/gobs/bin/gobs_setup_profile || die
-	dosbin  ${S}/gobs/bin/gobs_buildquerys || die
+	dosbin  ${S}/gobs/sbin/gobs_buildquerys || die
 	dodoc ${S}/gobs/sql/pgdump.sql.gz || die
 	dodoc  ${S}/gobs/doc/Setup.txt || die
 

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs
index 87e856e..c5d80a1 100755
--- a/gobs/bin/gobs_host_jobs
+++ b/gobs/bin/gobs_host_jobs
@@ -50,6 +50,7 @@ def main():
 			repeat = False
 		CM.putConnection(conn)
 		time.sleep(60)
+	CM.closeAllConnections()
 
 if __name__ == "__main__":
 	main()
\ No newline at end of file

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs~
similarity index 100%
copy from gobs/bin/gobs_host_jobs
copy to gobs/bin/gobs_host_jobs~

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py
index 20d8420..a39ff4d 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py
@@ -33,13 +33,13 @@ def sync_tree():
 	tmpcmdline = []
 	tmpcmdline.append("--sync")
 	tmpcmdline.append("--quiet")
-	tmpcmdline.append("--config_root=" + default_config_root)
-	print("tmpcmdline:" + tmpcmdline)
+	tmpcmdline.append("--config-root=" + default_config_root)
 	logging.info("Emerge --sync")
-	fail_sync = 0
+	fail_sync = False
 	#fail_sync = emerge_main(args=tmpcmdline)
 	if fail_sync is True:
 		logging.warning("Emerge --sync fail!")
+		return False
 	else:
 		logging.info("Emerge --sync ... Done.")
-	return
+	return True

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py~
similarity index 91%
copy from gobs/pym/sync.py
copy to gobs/pym/sync.py~
index 20d8420..a39ff4d 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py~
@@ -33,13 +33,13 @@ def sync_tree():
 	tmpcmdline = []
 	tmpcmdline.append("--sync")
 	tmpcmdline.append("--quiet")
-	tmpcmdline.append("--config_root=" + default_config_root)
-	print("tmpcmdline:" + tmpcmdline)
+	tmpcmdline.append("--config-root=" + default_config_root)
 	logging.info("Emerge --sync")
-	fail_sync = 0
+	fail_sync = False
 	#fail_sync = emerge_main(args=tmpcmdline)
 	if fail_sync is True:
 		logging.warning("Emerge --sync fail!")
+		return False
 	else:
 		logging.info("Emerge --sync ... Done.")
-	return
+	return True

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py
index 738179f..bd73602 100755
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py
@@ -1,4 +1,3 @@
-# Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """ 	This code will update the sql backend with needed info for
@@ -115,13 +114,15 @@ def update_db_main():
 	logging.info("Update db started.")
 	# Sync portage and profile/settings
 	git_pull
-	sync_tree()
+	resutalt = sync_tree()
+	if resutalt is False:
+		logging.info("Update db ... Fail.")
+		return False
 	# Init settings for the default config
 	mysettings =  init_portage_settings()
 	init_arch = gobs_arch()
 	init_arch.update_arch_db()
 	# Update the cpv db
 	update_cpv_db(mysettings)
-	CM.closeAllConnections()
 	logging.info("Update db ... Done.")
 	return True
\ No newline at end of file

diff --git a/gobs/pym/updatedb.py b/gobs/pym/updatedb.py~
similarity index 97%
copy from gobs/pym/updatedb.py
copy to gobs/pym/updatedb.py~
index 738179f..5919e64 100755
--- a/gobs/pym/updatedb.py
+++ b/gobs/pym/updatedb.py~
@@ -1,4 +1,3 @@
-# Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """ 	This code will update the sql backend with needed info for
@@ -115,13 +114,15 @@ def update_db_main():
 	logging.info("Update db started.")
 	# Sync portage and profile/settings
 	git_pull
-	sync_tree()
+	esutalt = sync_tree()
+	if resutalt is False:
+		logging.info("Update db ... Fail.")
+		return False
 	# Init settings for the default config
 	mysettings =  init_portage_settings()
 	init_arch = gobs_arch()
 	init_arch.update_arch_db()
 	# Update the cpv db
 	update_cpv_db(mysettings)
-	CM.closeAllConnections()
 	logging.info("Update db ... Done.")
 	return True
\ No newline at end of file