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

["Magnus Granberg" <zorry@gentoo.org>]

commit:     cfa1e254447b719a2a3fc59d7ecd9c0e933feefb
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 20:58:48 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 20:58:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=cfa1e254

Add logging sync.py

---
 gobs/bin/gobs_updatedb                     |   15 ++++++++-------
 gobs/bin/{gobs_updatedb => gobs_updatedb~} |   12 ++++++------
 gobs/pym/sync.py                           |   14 +++++++++++---
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/gobs/bin/gobs_updatedb b/gobs/bin/gobs_updatedb
index 4fba322..babaf38 100755
--- a/gobs/bin/gobs_updatedb
+++ b/gobs/bin/gobs_updatedb
@@ -114,14 +114,15 @@ def main():
 	# Main
 	# Logging
 	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], level=logging.INFO)
-	# Init settings for the default config
+	# Sync portage and profile/settings
 	git_pull
-	if sync_tree():
-		mysettings =  init_portage_settings()
-		init_arch = gobs_arch()
-		init_arch.update_arch_db()
-		# Update the cpv db
-		update_cpv_db(mysettings)
+	sync_tree()
+	# 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()
 	
 if __name__ == "__main__":

diff --git a/gobs/bin/gobs_updatedb b/gobs/bin/gobs_updatedb~
similarity index 96%
copy from gobs/bin/gobs_updatedb
copy to gobs/bin/gobs_updatedb~
index 4fba322..4dce5ce 100755
--- a/gobs/bin/gobs_updatedb
+++ b/gobs/bin/gobs_updatedb~
@@ -116,12 +116,12 @@ def main():
 	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], level=logging.INFO)
 	# Init settings for the default config
 	git_pull
-	if sync_tree():
-		mysettings =  init_portage_settings()
-		init_arch = gobs_arch()
-		init_arch.update_arch_db()
-		# Update the cpv db
-		update_cpv_db(mysettings)
+	sync_tree()
+	mysettings =  init_portage_settings()
+	init_arch = gobs_arch()
+	init_arch.update_arch_db()
+	# Update the cpv db
+	update_cpv_db(mysettings)
 	CM.closeAllConnections()
 	
 if __name__ == "__main__":

diff --git a/gobs/pym/sync.py b/gobs/pym/sync.py
index cfaebfe..22ff5e7 100644
--- a/gobs/pym/sync.py
+++ b/gobs/pym/sync.py
@@ -2,6 +2,8 @@ from __future__ import print_function
 import portage
 import os
 import errno
+import logging
+import sys
 from git import *
 from _emerge.actions import load_emerge_config, action_sync
 from _emerge.main import parse_opts
@@ -20,6 +22,12 @@ def sync_tree():
 	tmpcmdline.append("--sync")
 	tmpcmdline.append("--quiet")
 	myaction, myopts, myfiles = parse_opts(tmpcmdline)
-	fail_sync = action_sync(settings, trees, mtimedb, myopts, myaction)
-	print("fail_sync", fail_sync)
-	return fail_sync
\ No newline at end of file
+	logging.info("Eemerge --sync")
+	fail_sync = 1
+	#fail_sync = action_sync(settings, trees, mtimedb, myopts, myaction)
+	if fail_sync is True:
+		logging.warning("Emerge --sync fail!")
+		sys.exit()
+	else:
+		logging.info("Emerge --sync ... Done."
+	sys.exit()
\ No newline at end of file