commit: 682b192ef7f23ddebb56206e263a540e557ba515
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 09:58:30 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 09:58:30 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=682b192e
change new to updated in the update run and some typos
pym/tbc/package.py | 5 ++---
pym/tbc/sqlquerys.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index 0a5749d..3c5664c 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -141,7 +141,7 @@ class tbc_package(object):
#attDict['ebuild_version_text_tree'] =
ebuild_version_text_tree[0]
attDict['git_commit'] = git_commit
attDict['new'] = False
- attDict['update'] = False
+ attDict['updated'] = False
attDict['ebuild_version_descriptions_tree'] =
ebuild_version_metadata_tree[7]
return attDict
@@ -264,7 +264,6 @@ class tbc_package(object):
mytree = []
mytree.append(repodir)
pkgdir = repodir + "/" + cp # Get RepoDIR + cp
-
package_id = add_new_package_sql(self._session, cp, repo)
# Check cp with repoman full
@@ -377,7 +376,7 @@ class tbc_package(object):
# N = New ebuild
log_msg = "N %s:%s" % (cpv, repo,)
write_log(self._session, log_msg, "info",
self._config_id, 'packages.update_package_db')
- packageDict[cpv]['new'] = True
+ packageDict[cpv]['updated'] = True
package_updated = True
elif ebuild_version_checksum_tree !=
ebuild_version_manifest_checksum_db:
# U = Updated ebuild
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index 0ec5fc9..c9141ef 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -49,7 +49,7 @@ def get_job_status_waiting_on_guest(session):
JobsInfo = session.query(Jobs).filter_by(Status =
'Waiting_on_guest').one()
except NoResultFound as e:
return None
- return JobInfo.JobId
+ return JobsInfo.JobId
def update_job_list(session, status, job_id):
JobInfo = session.query(Jobs).filter_by(JobId = job_id).one()
