| 1 |
commit: 236dc594e15792d1b53501b7595edd571993e03b |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 5 02:52:40 2018 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 5 02:52:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=236dc594 |
| 7 |
|
| 8 |
use perform_checksum for checksum on files |
| 9 |
|
| 10 |
pym/tbc/build_job.py | 3 ++- |
| 11 |
pym/tbc/build_log.py | 4 ++-- |
| 12 |
pym/tbc/check_setup.py | 5 +++-- |
| 13 |
pym/tbc/package.py | 3 ++- |
| 14 |
pym/tbc/updatedb.py | 3 ++- |
| 15 |
5 files changed, 11 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/tbc/build_job.py b/pym/tbc/build_job.py |
| 18 |
index d0d72c3..8d10a68 100644 |
| 19 |
--- a/pym/tbc/build_job.py |
| 20 |
+++ b/pym/tbc/build_job.py |
| 21 |
@@ -12,6 +12,7 @@ from portage import _encodings |
| 22 |
from portage import _unicode_decode |
| 23 |
from portage.versions import cpv_getkey |
| 24 |
from portage.dep import check_required_use |
| 25 |
+from portage.checksum import perform_checksum |
| 26 |
from tbc.depclean import do_depclean |
| 27 |
from tbc.flags import tbc_use_flags |
| 28 |
from tbc.qachecks import check_file_in_manifest |
| 29 |
@@ -34,7 +35,7 @@ class build_job_action(object): |
| 30 |
pkgdir = portdb.getRepositoryPath(repo) + "/" + cp |
| 31 |
build_use_flags_list = [] |
| 32 |
try: |
| 33 |
- ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir + "/" + package + "-" + build_dict['ebuild_version'] + ".ebuild")[0] |
| 34 |
+ ebuild_version_checksum_tree = perform_checksum(pkgdir + "/" + package + "-" + build_dict['ebuild_version'] + ".ebuild", "SHA256")[0] |
| 35 |
except: |
| 36 |
ebuild_version_checksum_tree = None |
| 37 |
if ebuild_version_checksum_tree == build_dict['checksum']: |
| 38 |
|
| 39 |
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py |
| 40 |
index 762ebd4..e9e5dd0 100644 |
| 41 |
--- a/pym/tbc/build_log.py |
| 42 |
+++ b/pym/tbc/build_log.py |
| 43 |
@@ -14,7 +14,7 @@ from portage.util import writemsg, \ |
| 44 |
writemsg_level, writemsg_stdout |
| 45 |
from portage import _encodings |
| 46 |
from portage import _unicode_encode |
| 47 |
- |
| 48 |
+from portage.checksum import perform_checksum |
| 49 |
from _emerge.main import parse_opts |
| 50 |
|
| 51 |
portage.proxy.lazyimport.lazyimport(globals(), |
| 52 |
@@ -106,7 +106,7 @@ def get_build_dict_db(session, config_id, settings, tbc_settings_dict, pkg): |
| 53 |
else: |
| 54 |
build_dict['build_useflags'] = use_flagsDict |
| 55 |
pkgdir = myportdb.getRepositoryPath(repo) + "/" + categories + "/" + package |
| 56 |
- ebuild_version_checksum_tree = portage.checksum.sha256hash(pkgdir+ "/" + package + "-" + ebuild_version + ".ebuild")[0] |
| 57 |
+ ebuild_version_checksum_tree = perform_checksum(pkgdir+ "/" + package + "-" + ebuild_version + ".ebuild", "SHA256")[0] |
| 58 |
build_dict['checksum'] = ebuild_version_checksum_tree |
| 59 |
ebuild_id_list, status = get_ebuild_id_db(session, build_dict['checksum'], build_dict['package_id'], build_dict['ebuild_version']) |
| 60 |
if status: |
| 61 |
|
| 62 |
diff --git a/pym/tbc/check_setup.py b/pym/tbc/check_setup.py |
| 63 |
index a5f53e7..dcd7a0c 100644 |
| 64 |
--- a/pym/tbc/check_setup.py |
| 65 |
+++ b/pym/tbc/check_setup.py |
| 66 |
@@ -7,6 +7,7 @@ import os |
| 67 |
import errno |
| 68 |
|
| 69 |
from portage.exception import DigestException, FileNotFound, ParseError, PermissionDenied |
| 70 |
+from portage.checksum import perform_checksum |
| 71 |
from tbc.text import get_file_text |
| 72 |
from tbc.sqlquerys import get_config_all_info, add_logs, get_configmetadata_info, get_setup_info |
| 73 |
from tbc.sync import git_pull |
| 74 |
@@ -29,7 +30,7 @@ def check_make_conf(session, config_id): |
| 75 |
# Check if we have some error in the file. (portage.util.getconfig) |
| 76 |
# Check if we envorment error with the config. (settings.validate) |
| 77 |
try: |
| 78 |
- make_conf_checksum_tree = portage.checksum.sha256hash(make_conf_file)[0] |
| 79 |
+ make_conf_checksum_tree = perform_checksum(make_conf_file, "SHA256")[0] |
| 80 |
portage.util.getconfig(make_conf_file, tolerant=0, allow_sourcing=True, expand=True) |
| 81 |
mysettings = portage.config(config_root = check_config_dir) |
| 82 |
mysettings.validate() |
| 83 |
@@ -61,7 +62,7 @@ def check_configure_guest(session, config_id): |
| 84 |
# Check if we have some error in the file (portage.util.getconfig) |
| 85 |
# Check if we envorment error with the config (settings.validate) |
| 86 |
try: |
| 87 |
- make_conf_checksum_tree = portage.checksum.sha256hash(make_conf_file)[0] |
| 88 |
+ make_conf_checksum_tree = perform_checksum(make_conf_file, "SHA256")[0] |
| 89 |
portage.util.getconfig(make_conf_file, tolerant=0, allow_sourcing=True, expand=True) |
| 90 |
mysettings = portage.config(config_root = "/") |
| 91 |
mysettings.validate() |
| 92 |
|
| 93 |
diff --git a/pym/tbc/package.py b/pym/tbc/package.py |
| 94 |
index 721f9b1..84e3907 100644 |
| 95 |
--- a/pym/tbc/package.py |
| 96 |
+++ b/pym/tbc/package.py |
| 97 |
@@ -9,6 +9,7 @@ import git |
| 98 |
import portage |
| 99 |
import datetime |
| 100 |
from portage.xml.metadata import MetaDataXML |
| 101 |
+from portage.checksum import perform_checksum |
| 102 |
from tbc.flags import tbc_use_flags |
| 103 |
from tbc.text import get_ebuild_cvs_revision, get_log_text_dict |
| 104 |
from tbc.flags import tbc_use_flags |
| 105 |
@@ -111,7 +112,7 @@ class tbc_package(object): |
| 106 |
ebuild_file = pkgdir + "/" + package + "-" + ebuild_version_tree + ".ebuild" |
| 107 |
# Make a checksum of the ebuild |
| 108 |
try: |
| 109 |
- ebuild_version_checksum_tree = portage.checksum.sha256hash(ebuild_file)[0] |
| 110 |
+ ebuild_version_checksum_tree = perform_checksum(ebuild_file, "SHA256")[0] |
| 111 |
except: |
| 112 |
ebuild_version_checksum_tree = "0" |
| 113 |
log_msg = "QA: Can't checksum the ebuild file. %s on repo %s" % (cpv, repo,) |
| 114 |
|
| 115 |
diff --git a/pym/tbc/updatedb.py b/pym/tbc/updatedb.py |
| 116 |
index 437cfd5..d32f0ac 100644 |
| 117 |
--- a/pym/tbc/updatedb.py |
| 118 |
+++ b/pym/tbc/updatedb.py |
| 119 |
@@ -9,6 +9,7 @@ import time |
| 120 |
import re |
| 121 |
import portage |
| 122 |
from portage.xml.metadata import MetaDataXML |
| 123 |
+from portage.checksum import perform_checksum |
| 124 |
from sqlalchemy.orm import scoped_session, sessionmaker |
| 125 |
from tbc.ConnectionManager import NewConnection |
| 126 |
from tbc.sqlquerys import get_package_info, update_repo_db, \ |
| 127 |
@@ -46,7 +47,7 @@ def get_categories_metadataDict(pkgdir): |
| 128 |
pkg_md = MetaDataXML(pkgdir + "/metadata.xml", None) |
| 129 |
metadata_xml_descriptions_tree = re.sub('\t', '', pkg_md.descriptions()[0]) |
| 130 |
categories_metadataDict['metadata_xml_descriptions'] = re.sub('\n', '', metadata_xml_descriptions_tree) |
| 131 |
- categories_metadataDict['metadata_xml_checksum'] = portage.checksum.sha256hash(pkgdir + "/metadata.xml")[0] |
| 132 |
+ categories_metadataDict['metadata_xml_checksum'] = perform_checksum(pkgdir + "/metadata.xml", "SHA256")[0] |
| 133 |
return categories_metadataDict |
| 134 |
|
| 135 |
def update_cpv_db_pool(mysettings, myportdb, cp, repo, tbc_settings, config_id): |
Archives