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 1ECB9138D18 for ; Wed, 15 Jul 2015 12:05:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DE0BE081A; Wed, 15 Jul 2015 12:04:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BD1FE081A for ; Wed, 15 Jul 2015 12:04:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42AB2340813 for ; Wed, 15 Jul 2015 12:04:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F614738 for ; Wed, 15 Jul 2015 12:04:52 +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: <1436961858.be8a15743d2e39cc96e47e7bd5161a7be4a59fc8.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: tbc/pym/ X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: tbc/pym/db_mapping.py tbc/pym/package.py tbc/pym/sqlquerys.py X-VCS-Directories: tbc/pym/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: be8a15743d2e39cc96e47e7bd5161a7be4a59fc8 X-VCS-Branch: master Date: Wed, 15 Jul 2015 12:04:52 +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: cde829ad-a75c-47ab-b8ea-b1b740e075ba X-Archives-Hash: 76cd5e3e694e6b2e3f77b7d01bb2e3f4 commit: be8a15743d2e39cc96e47e7bd5161a7be4a59fc8 Author: Magnus Granberg gentoo org> AuthorDate: Wed Jul 15 12:04:18 2015 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Wed Jul 15 12:04:18 2015 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=be8a1574 add Descriptions to ebuild metadata in db tbc/pym/db_mapping.py | 1 + tbc/pym/package.py | 2 ++ tbc/pym/sqlquerys.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tbc/pym/db_mapping.py b/tbc/pym/db_mapping.py index b78bd1e..76ff33e 100644 --- a/tbc/pym/db_mapping.py +++ b/tbc/pym/db_mapping.py @@ -269,4 +269,5 @@ class EbuildsMetadata(Base): Id = Column('id', Integer, primary_key=True) EbuildId = Column('ebuild_id', ForeignKey('ebuilds.ebuild_id')) Revision = Column('revision', String(30)) + Descriptions = Column('descriptions', String(200)) __tablename__ = 'ebuilds_metadata' diff --git a/tbc/pym/package.py b/tbc/pym/package.py index 502ea01..3e87aa6 100644 --- a/tbc/pym/package.py +++ b/tbc/pym/package.py @@ -122,6 +122,7 @@ class tbc_package(object): attDict['ebuild_version_metadata_tree'] = ebuild_version_metadata_tree #attDict['ebuild_version_text_tree'] = ebuild_version_text_tree[0] attDict['ebuild_version_revision_tree'] = ebuild_version_cvs_revision_tree + attDict['ebuild_version_descriptions_tree'] = ebuild_version_metadata_tree[7] return attDict def add_new_build_job_db(self, ebuild_id_list, packageDict, config_cpv_listDict): @@ -182,6 +183,7 @@ class tbc_package(object): log_msg = "Metadata file %s missing Email" % (pkgdir + "/metadata.xml") add_logs(self._session, log_msg, "qa", self._config_id) attDict['metadata_xml_email'] = False + attDict['metadata_xml_descriptions'] = pkg_md.descriptions()[0] attDict['metadata_xml_checksum'] = portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0] #attDict['metadata_xml_text'] = metadata_xml_text_tree package_metadataDict[package_id] = attDict diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py index a8f2af4..b897f16 100644 --- a/tbc/pym/sqlquerys.py +++ b/tbc/pym/sqlquerys.py @@ -397,7 +397,7 @@ def add_new_ebuild_sql(session, packageDict): #x.Active = False #session.commit() sys.exit() - session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId, Revision = v['ebuild_version_revision_tree'])) + session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId, Revision = v['ebuild_version_revision_tree'], Descriptions = v['ebuild_version_descriptions_tree'])) session.commit() ebuild_id_list.append(EbuildInfo.EbuildId) restrictions = []