From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-391250-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RDaNo-0003yf-OR for garchives@archives.gentoo.org; Tue, 11 Oct 2011 11:20:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35CF721C027; Tue, 11 Oct 2011 11:20:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 021F421C027 for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 11:20:19 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88AB21B4010 for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 11:20:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D117F80042 for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 11:20:18 +0000 (UTC) From: "Magnus Granberg" <zorry@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" <zorry@gentoo.org> Message-ID: <fa498465e36af8f5097f28767ac1f5537a5cde44.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: gobs/pym/ X-VCS-Repository: dev/zorry X-VCS-Files: gobs/pym/build_log.py gobs/pym/pgsql.py X-VCS-Directories: gobs/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: fa498465e36af8f5097f28767ac1f5537a5cde44 Date: Tue, 11 Oct 2011 11:20:18 +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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1c87113a9c4cbd2001a66b4b00e10693 commit: fa498465e36af8f5097f28767ac1f5537a5cde44 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Tue Oct 11 11:19:51 2011 +0000 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> CommitDate: Tue Oct 11 11:19:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/zorry.git;a=3D= commit;h=3Dfa498465 fix a bug when get queue_id for the loging thing --- gobs/pym/build_log.py | 2 +- gobs/pym/pgsql.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gobs/pym/build_log.py b/gobs/pym/build_log.py index 80a7f0a..4ba3f37 100644 --- a/gobs/pym/build_log.py +++ b/gobs/pym/build_log.py @@ -62,7 +62,7 @@ class gobs_buildlog(object): iuse_flags_list, final_use_list =3D init_useflags.get_flags_pkg(pkg, s= ettings) #print 'final_use_list', final_use_list if final_use_list !=3D []: - build_dict['build_useflags'] =3D final_use_list + build_dict['build_useflags'] =3D sorted(final_use_list) else: build_dict['build_useflags'] =3D None #print "build_dict['build_useflags']", build_dict['build_useflags'] diff --git a/gobs/pym/pgsql.py b/gobs/pym/pgsql.py index 85cb057..aeda4eb 100644 --- a/gobs/pym/pgsql.py +++ b/gobs/pym/pgsql.py @@ -502,7 +502,10 @@ def add_new_buildlog(connection, build_dict, use_fla= gs_list, use_enable_list, bu cursor.execute(sqlQ, params) entries =3D cursor.fetchone() connection.commit() - return entries + if entries is None: + return None + # If entries is not None we need [0] + return entries[0] =20 def add_qa_repoman(connection, ebuild_id_list, qa_error, packageDict, co= nfig_id): cursor =3D connection.cursor()