commit: 981f86a56468a7561c8804044c238359cb1b7c2d
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 22:39:54 2015 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 22:39:54 2015 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=981f86a5
add descriptions to package
tbc/pym/db_mapping.py | 3 +--
tbc/pym/package.py | 3 ---
tbc/pym/sqlquerys.py | 5 ++---
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/tbc/pym/db_mapping.py b/tbc/pym/db_mapping.py
index 37eaec8..67c2d61 100644
--- a/tbc/pym/db_mapping.py
+++ b/tbc/pym/db_mapping.py
@@ -103,9 +103,8 @@ class PackagesEmails(Base):
class PackagesMetadata(Base):
Id = Column('id', Integer, primary_key=True)
PackageId = Column('package_id', Integer,
ForeignKey('packages.package_id'))
- Checksum = Column('checksum', String(100))
- ChecksumChanglog = Column('checksum_chlog', String(100))
Changlog = Column('changlog', Text)
+ Descriptions = Column('descriptions', Text)
__tablename__ = 'packages_metadata'
class Ebuilds(Base):
diff --git a/tbc/pym/package.py b/tbc/pym/package.py
index c8a70db..f834fb2 100644
--- a/tbc/pym/package.py
+++ b/tbc/pym/package.py
@@ -186,7 +186,6 @@ class tbc_package(object):
md_email_list = []
herd = None
pkg_md = MetaDataXML(pkgdir + "/metadata.xml", herd)
- attDict['changelog_checksum'] =
portage.checksum.sha256hash(pkgdir + "/ChangeLog")[0]
attDict['changelog_text'] = self.get_changelog_text(pkgdir)
tmp_herds = pkg_md.herds()
if tmp_herds != ():
@@ -202,8 +201,6 @@ class tbc_package(object):
attDict['metadata_xml_email'] = False
metadata_xml_descriptions_tree = re.sub('\t', '',
pkg_md.descriptions()[0])
attDict['metadata_xml_descriptions'] = re.sub('\n', '',
metadata_xml_descriptions_tree)
- attDict['metadata_xml_checksum'] =
portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0]
- #attDict['metadata_xml_text'] = metadata_xml_text_tree
package_metadataDict[package_id] = attDict
return package_metadataDict
diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py
index 7a64db7..f7f5a97 100644
--- a/tbc/pym/sqlquerys.py
+++ b/tbc/pym/sqlquerys.py
@@ -490,12 +490,11 @@ def update_package_metadata(session,
package_metadataDict):
try:
PackagesMetadataInfo =
session.query(PackagesMetadata).filter_by(PackageId = k).one()
except NoResultFound as e:
- session.add(PackagesMetadata(PackageId = k, Checksum =
v['metadata_xml_checksum'], ChecksumChanglog = v['changelog_checksum'],
Changlog = v['changelog_text']))
+ session.add(PackagesMetadata(PackageId = k, Changlog =
v['changelog_text'], Descriptions = v['metadata_xml_descriptions']))
session.commit()
else:
- PackagesMetadataInfo.Checksum =
v['metadata_xml_checksum']
- PackagesMetadataInfo.ChecksumChanglog =
v['changelog_checksum']
PackagesMetadataInfo.Changlog = v['changelog_text']
+ PackagesMetadataInfo.Descriptions =
v['metadata_xml_descriptions']
session.commit()
if v['metadata_xml_email']:
for email in v['metadata_xml_email']:
