From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-534004-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id B66AF1381F3
for <garchives@archives.gentoo.org>; Tue, 11 Dec 2012 23:48:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7334421C002;
Tue, 11 Dec 2012 23:48:48 +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 D1A5E21C002
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Dec 2012 23:48:47 +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 BC17A33DBB2
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Dec 2012 23:48:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 598E2E543C
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Dec 2012 23:48:45 +0000 (UTC)
From: "Magnus Granberg" <zorry@gentoo.org>
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" <zorry@gentoo.org>
Message-ID: <1355269711.41003d4655d0a346ac76e39e204f1bba560b5e9d.zorry@gentoo>
Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/
X-VCS-Repository: dev/zorry
X-VCS-Files: gobs/pym/actions.py gobs/pym/build_queru.py gobs/pym/pgsql_querys.py
X-VCS-Directories: gobs/pym/
X-VCS-Committer: zorry
X-VCS-Committer-Name: Magnus Granberg
X-VCS-Revision: 41003d4655d0a346ac76e39e204f1bba560b5e9d
X-VCS-Branch: master
Date: Tue, 11 Dec 2012 23:48:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d6bf0f24-6e58-42d1-b146-6b62cd97ed4d
X-Archives-Hash: adc961eb173423584c481fae314c531d
commit: 41003d4655d0a346ac76e39e204f1bba560b5e9d
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 23:48:31 2012 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 23:48:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=41003d46
fix some invalid syntax
---
gobs/pym/actions.py | 2 +-
gobs/pym/build_queru.py | 4 ++--
gobs/pym/pgsql_querys.py | 26 ++++++++++++--------------
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/gobs/pym/actions.py b/gobs/pym/actions.py
index 4b48408..6842ff3 100644
--- a/gobs/pym/actions.py
+++ b/gobs/pym/actions.py
@@ -70,7 +70,7 @@ from _emerge.MetadataRegen import MetadataRegen
from _emerge.Package import Package
from _emerge.ProgressHandler import ProgressHandler
from _emerge.RootConfig import RootConfig
-from gobs..Scheduler import Scheduler
+from gobs.Scheduler import Scheduler
from _emerge.search import search
from _emerge.SetArg import SetArg
from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice
diff --git a/gobs/pym/build_queru.py b/gobs/pym/build_queru.py
index 74ec3d3..b1685bf 100644
--- a/gobs/pym/build_queru.py
+++ b/gobs/pym/build_queru.py
@@ -124,7 +124,7 @@ class queruaction(object):
log_msg = "build_job %s was not removed" % (build_dict['build_job_id'],)
add_gobs_logs(conn, log_msg, "info", self._config_profile)
print("qurery was not removed")
- if build_fail is True
+ if build_fail is True:
build_dict['type_fail'] = "Emerge faild"
build_dict['check_fail'] = True
log_msg = "Emerge faild!"
@@ -133,7 +133,7 @@ class queruaction(object):
build_dict['type_fail'] = "Querey was not removed"
build_dict['check_fail'] = True
log_fail_queru(build_dict, settings)
- if build_fail is True
+ if build_fail is True:
CM.putConnection(conn)
return True
CM.putConnection(conn)
diff --git a/gobs/pym/pgsql_querys.py b/gobs/pym/pgsql_querys.py
index 2149798..468afc5 100644
--- a/gobs/pym/pgsql_querys.py
+++ b/gobs/pym/pgsql_querys.py
@@ -436,22 +436,20 @@ def add_new_buildlog(connection, build_dict, build_log_dict):
useflagsdict = {}
if entries == []:
useflagsdict = None
- else:
+ else:
for x in entries:
useflagsdict[x[0]] = x[1]
- print(build_log_id)
- print(log_hash[0], build_log_dict['log_hash'], build_dict['build_useflags'], useflagsdict)
- if log_hash[0] == build_log_dict['log_hash'] and build_dict['build_useflags'] == useflagsdict:
- cursor.execute(sqlQ9, (build_log_id,))
- config_id_list = []
- for config_id in cursor.fetchall():
- config_id_list.append(config_id[0])
- print(build_dict['config_id'], config_id_list)
- if build_dict['config_id'] in config_id_list:
- return None, True
- else:
- cursor.execute(sqlQ4, (build_log_id, build_dict['config_id'], build_log_dict['logfilename'],))
- return build_log_id, True
+ print(log_hash[0], build_log_dict['log_hash'], build_dict['build_useflags'], useflagsdict)
+ if log_hash[0] == build_log_dict['log_hash'] and build_dict['build_useflags'] == useflagsdict:
+ cursor.execute(sqlQ9, (build_log_id,))
+ config_id_list = []
+ for config_id in cursor.fetchall():
+ config_id_list.append(config_id[0])
+ if build_dict['config_id'] in config_id_list:
+ return None, True
+ else:
+ cursor.execute(sqlQ4, (build_log_id, build_dict['config_id'], build_log_dict['logfilename'],))
+ return build_log_id, True
return None, False
def build_log_id_no_match(build_dict, build_log_dict):