yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Ludwig Nussel 2015-03-27 15:02:23 +01:00
parent 13a176b3d3
commit b17c003a06
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
abichecker/ReviewBot.py Symbolic link
View File

@ -0,0 +1 @@
../ReviewBot.py

17
abichecker.py → abichecker/abichecker.py
View File

@ -30,6 +30,7 @@ import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
import time
import abichecker_dbmodel as DB import abichecker_dbmodel as DB
try: try:
@ -121,7 +122,7 @@ class ABIChecker(ReviewBot.ReviewBot):
pairs = set() pairs = set()
for lib in dst_libs.keys(): for lib in dst_libs.keys():
if lib in src_libs: if lib in src_libs:
paris.add((lib, lib)) pairs.add((lib, lib))
else: else:
self.logger.debug("%s not found in submission, checking aliases", lib) self.logger.debug("%s not found in submission, checking aliases", lib)
for a in dst_libs[lib]: for a in dst_libs[lib]:
@ -150,7 +151,7 @@ class ABIChecker(ReviewBot.ReviewBot):
# we just need that to pass a name to abi checker # we just need that to pass a name to abi checker
m = so_re.match(old) m = so_re.match(old)
htmlreport = 'report-%s-%s-%s-%s-%s.html'%(mr.srcrepo, os.path.basename(old), mr.dstrepo, os.path.basename(new), mr.arch) htmlreport = 'report-%s-%s-%s-%s-%s-%08x.html'%(mr.srcrepo, os.path.basename(old), mr.dstrepo, os.path.basename(new), mr.arch, time.time())
# run abichecker # run abichecker
if m \ if m \
@ -186,7 +187,6 @@ class ABIChecker(ReviewBot.ReviewBot):
self.reports = [] self.reports = []
ret = ReviewBot.ReviewBot.check_one_request(self, req) ret = ReviewBot.ReviewBot.check_one_request(self, req)
pprint(self.reports)
self.save_reports_to_db() self.save_reports_to_db()
@ -194,7 +194,7 @@ class ABIChecker(ReviewBot.ReviewBot):
def save_reports_to_db(self): def save_reports_to_db(self):
for r in self.reports: for r in self.reports:
submission = DB.Submission( abicheck = DB.ABICheck(
src_project = r.src_project, src_project = r.src_project,
src_package = r.src_package, src_package = r.src_package,
src_rev = r.src_rev, src_rev = r.src_rev,
@ -202,11 +202,12 @@ class ABIChecker(ReviewBot.ReviewBot):
dst_package = r.dst_package, dst_package = r.dst_package,
result = r.result, result = r.result,
) )
self.session.add(submission) self.session.add(abicheck)
self.logger.info("id %d"%submission.id) self.session.commit()
self.logger.info("id %d"%abicheck.id)
for lr in r.reports: for lr in r.reports:
libreport = DB.LibReport( libreport = DB.LibReport(
submission = submission, abicheck = abicheck,
src_repo = lr.src_repo, src_repo = lr.src_repo,
src_lib = lr.src_lib, src_lib = lr.src_lib,
dst_repo = lr.dst_repo, dst_repo = lr.dst_repo,
@ -216,7 +217,7 @@ class ABIChecker(ReviewBot.ReviewBot):
result = lr.result, result = lr.result,
) )
self.session.add(libreport) self.session.add(libreport)
self.session.commit() self.session.commit()
self.reports = [] self.reports = []

1
abichecker/osclib Symbolic link
View File

@ -0,0 +1 @@
../osclib