commit: 7d547c4e12884b4f2914eb9e151d3f043978ba42
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 15:31:57 2017 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 15:31:57 2017 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=7d547c4e
add slot and homepage
pym/tbc/db_mapping.py | 3 +++
pym/tbc/package.py | 2 +-
pym/tbc/sqlquerys.py | 6 ++++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index 96ae75b..f48ef56 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -293,6 +293,9 @@ class EbuildsMetadata(Base):
New = Column('new', Boolean, default=False)
Updated = Column('updated', Boolean, default=False)
Descriptions = Column('descriptions', Text)
+ Slot = Column('slot', String(10))
+ Homepage = Column('homepage', String(200))
+ License = Column('license', String(200))
__tablename__ = 'ebuilds_metadata'
class TbcConfig(Base):
diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index 4bbb63e..721f9b1 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -299,7 +299,7 @@ class tbc_package(object):
# take package descriptions from the ebuilds
if
package_metadataDict[package_id]['metadata_xml_descriptions'] !=
packageDict[cpv]['ebuild_version_descriptions_tree']:
package_metadataDict[package_id]['metadata_xml_descriptions'] =
packageDict[cpv]['ebuild_version_descriptions_tree']
- package_metadataDict[package_id][new] = True
+ package_metadataDict[package_id]['new'] = True
self.add_package(packageDict, package_metadataDict, package_id,
new_ebuild_id_list, old_ebuild_id_list)
log_msg = "C %s:%s ... Done." % (cp, repo)
write_log(self._session, log_msg, "info", self._config_id,
'packages.add_new_package_db')
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index de60af7..9c962f4 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -432,7 +432,9 @@ def add_new_ebuild_sql(session, packageDict):
except (MultipleResultsFound) as e:
# FIXME
sys.exit()
- session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId, New
= v['new'], Updated = v['updated'], Commit = v['git_commit'], CommitMsg =
v['git_commit_msg'], Descriptions = v['ebuild_version_descriptions_tree']))
+ session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId, New
= v['new'], Updated = v['updated'], Commit = v['git_commit'], \
+ CommitMsg = v['git_commit_msg'], Descriptions =
v['ebuild_version_descriptions_tree'], Slot =
v['ebuild_version_metadata_tree'][2], \
+ Homepage = v['ebuild_version_metadata_tree'][5],
License = v['ebuild_version_metadata_tree'][6]))
session.commit()
ebuild_id_list.append(EbuildInfo.EbuildId)
restrictions = []
@@ -636,7 +638,7 @@ def reset_new_updated(session):
for x in EMInfo:
x.New = False
session.flush()
-try:
+ try:
BLInfo = session.query(BuildLogs).filter(BuildLogs.New ==
True).all()
except NoResultFound as e:
pass
