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

[Magnus Granberg]

commit:     dd38e1fe6839e6d5c018fc99fae687e0c0a7eeaa
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 00:15:46 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue May  1 00:15:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=dd38e1fe

Remove code that is not needed (sync stuff)

---
 gobs/pym/check_setup.py |   11 -----------
 gobs/pym/pgsql.py       |   32 +-------------------------------
 2 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/gobs/pym/check_setup.py b/gobs/pym/check_setup.py
index 8f8aa87..c0ba2ee 100644
--- a/gobs/pym/check_setup.py
+++ b/gobs/pym/check_setup.py
@@ -4,7 +4,6 @@ import os
 import errno
 from git import *
 from gobs.text import get_file_text
-from gobs.sync import sync_tree
 
 from gobs.readconf import get_conf_settings
 reader=get_conf_settings()
@@ -16,13 +15,6 @@ CM=connectionManager(gobs_settings_dict)
 if CM.getName()=='pgsql':
 	from gobs.pgsql import *
 
-def git_pull():
-	repo = Repo("/var/cache/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/")
-	repo_remote = repo.remotes.origin
-	repo_remote.pull()
-	master = repo.head.reference
-	print(master.log())
-
 def check_make_conf():
   # FIXME: mark any config updating true in the db when updating the configs
   # Get the config list
@@ -69,9 +61,6 @@ def check_make_conf_guest(config_profile):
 	make_conf_checksum_db = get_profile_checksum(conn,config_profile)
 	print('make_conf_checksum_db', make_conf_checksum_db)
 	if make_conf_checksum_db is None:
-		if get_profile_sync(conn, config_profile) is True:
-			if sync_tree():
-				reset_profile_sync(conn, config_profile)
 		CM.putConnection(conn)
 		return False
 	make_conf_file = "/etc/portage/make.conf"

diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py
index 64f1b46..67451bb 100644
--- a/gobs/pym/pgsql.py
+++ b/gobs/pym/pgsql.py
@@ -9,40 +9,10 @@ def get_default_config(connection):
 
 def get_profile_checksum(connection, config_profile):
     cursor = connection.cursor()
-    sqlQ = "SELECT make_conf_checksum FROM configs WHERE active = 'True' AND id = %s AND updateing = 'False' AND sync = 'False'"
+    sqlQ = "SELECT make_conf_checksum FROM configs WHERE active = 'True' AND id = %s AND auto = 'True'"
     cursor.execute(sqlQ, (config_profile,))
     return cursor.fetchone()
 
-def get_profile_sync(connection, config_profile):
-	cursor = connection.cursor()
-	sqlQ = "SELECT sync FROM configs WHERE active = 'True' AND id = %s AND updateing = 'False'"
-	cursor.execute(sqlQ, (config_profile,))
-	return cursor.fetchone()
-
-def set_profile_sync(connection):
-	cursor = connection.cursor()
-	sqlQ = "UPDATE configs SET sync = 'True' WHERE active = 'True'"
-	cursor.execute(sqlQ)
-	connection.commit()
-
-def reset_profile_sync(connection, config_profile):
-	cursor = connection.cursor()
-	sqlQ = "UPDATE configs SET sync = 'False' WHERE active = 'True' AND  id = %s"
-	cursor.execute(sqlQ, (config_profile,))
-	connection.commit()
-
-def set_profile_updating(connection):
-	cursor = connection.cursor()
-	sqlQ = "UPDATE configs SET updating = 'True' WHERE active = 'True'"
-	cursor.execute(sqlQ)
-	connection.commit()
-
-def reset_profile_sync(connection, config_profile):
-	cursor = connection.cursor()
-	sqlQ = "UPDATE configs SET updating = 'False' WHERE active = 'True'"
-	cursor.execute(sqlQ)
-	connection.commit()
-
 def get_packages_to_build(connection, config_profile):
   cursor =connection.cursor()
   # no point in returning dead ebuilds, to just chuck em out later