From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BA92D1381F3 for ; Thu, 6 Dec 2012 00:11:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52926E060F; Thu, 6 Dec 2012 00:11:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9CFBE060F for ; Thu, 6 Dec 2012 00:11:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA9CF33D923 for ; Thu, 6 Dec 2012 00:11:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4DC9CE5436 for ; Thu, 6 Dec 2012 00:11:38 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1354752685.c8e49a6e01dc30bf894080fbe58da1bf3546be48.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/jobs.py gobs/pym/pgsql_querys.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: c8e49a6e01dc30bf894080fbe58da1bf3546be48 X-VCS-Branch: master Date: Thu, 6 Dec 2012 00:11:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1161fc38-6894-4825-a389-daba3599e48c X-Archives-Hash: 0162537340e51cbba768cee4ac3f5ae2 commit: c8e49a6e01dc30bf894080fbe58da1bf3546be48 Author: Magnus Granberg gentoo org> AuthorDate: Thu Dec 6 00:11:25 2012 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Thu Dec 6 00:11:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=c8e49a6e fix tabs and spaces in indentation --- gobs/pym/jobs.py | 2 +- gobs/pym/pgsql_querys.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gobs/pym/jobs.py b/gobs/pym/jobs.py index 3eaab83..11543a2 100644 --- a/gobs/pym/jobs.py +++ b/gobs/pym/jobs.py @@ -24,7 +24,7 @@ def jobs_main(config_profile): for job_id in jobs_id: job = get_job(conn, job_id) log_msg = "Job: %s Type: %s" % (job_id, job,) - add_gobs_logs(conn, log_msg, "info", config_profile) + add_gobs_logs(conn, log_msg, "info", config_profile) if job == "addbuildquery": update_job_list(conn, "Runing", job_id) log_msg = "Job %s is runing." % (job_id,) diff --git a/gobs/pym/pgsql_querys.py b/gobs/pym/pgsql_querys.py index d945d7f..517db8b 100644 --- a/gobs/pym/pgsql_querys.py +++ b/gobs/pym/pgsql_querys.py @@ -208,7 +208,7 @@ def get_config_id_list(connection): return None else: config_id_list = [] - for config_id in entries: + for config_id in entries: config_id_list.append(config_id[0]) return config_id_list @@ -319,15 +319,15 @@ def get_packages_to_build(connection, config): cursor =connection.cursor() sqlQ1 = "SELECT build_job_id.build_jobs, ebuild_id.build_jobs, package_id.ebuilds FROM build_jobs, ebuilds WHERE \ config_id.build_jobs = (SELECT config_id FROM configs WHERE config = %s) \ - AND extract(epoch from (NOW()) - time_stamp.build_jobs) > 7200 AND ebuild_id.build_jobs = ebuild_id.ebuilds \ - AND ebuilds.active = 'True' ORDER BY LIMIT 1" + AND extract(epoch from (NOW()) - time_stamp.build_jobs) > 7200 AND ebuild_id.build_jobs = ebuild_id.ebuilds \ + AND ebuilds.active = 'True' ORDER BY LIMIT 1" sqlQ2 = 'SELECT version, checksum FROM ebuilds WHERE ebuild_id = %s' sqlQ3 = 'SELECT flag.uses, status.build_jobs_use FROM build_jobs_use, uses WHERE build_job_id.build_jobs_use = %s use_id.build_jobs_use = use_id.uses' cursor.execute(sqlQ1, (config,)) build_dict={} entries = cursor.fetchone() if entries is None: - return None + return None build_dict['build_job_id'] = entries[0] build_dict['ebuild_id']= entries[1] build_dict['package_id'] = entries[2] @@ -339,7 +339,7 @@ def get_packages_to_build(connection, config): cursor.execute(sqlQ3, (build_dict['build_job_id'],)) uses={} for row in cursor.fetchall(): - uses[ row[0] ] = row[1] + uses[ row[0] ] = row[1] build_dict['build_useflags']=uses return build_dict