From a3e42c63bdbe5fd61b706f3292cf98e6651bf540 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 2 Jun 2020 12:44:11 +0200 Subject: [PATCH] Fix injection --- letsencrypt-auto-source/rebuild_dependencies.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/letsencrypt-auto-source/rebuild_dependencies.py b/letsencrypt-auto-source/rebuild_dependencies.py index e3d4be0f3..7b8a0acf2 100644 --- a/letsencrypt-auto-source/rebuild_dependencies.py +++ b/letsencrypt-auto-source/rebuild_dependencies.py @@ -44,7 +44,7 @@ AUTHORITATIVE_CONSTRAINTS = { 'python-augeas': '0.5.0', # Package enum34 needs to be explicitly limited to Python2.x, in order to avoid # certbot-auto failures on Python 3.6+ which enum34 doesn't support. See #5456. - 'enum34': '1.1.6 ; python_version < \'3.4\'', + 'enum34': '1.1.10 ; python_version < \'3.4\'', # Cryptography 2.9+ drops support for OpenSSL 1.0.1, but we still want to support it # for officially supported non-x86_64 ancient distributions like RHEL 6 or Debian 8. 'cryptography': '2.8', @@ -229,10 +229,10 @@ def _write_requirements(dest_file, requirements, conflicts): ''') for req in requirements: - if req in AUTHORITATIVE_CONSTRAINTS: + if req[0] in AUTHORITATIVE_CONSTRAINTS: # If requirement is in AUTHORITATIVE_CONSTRAINTS, take its value instead of the # computed one to get any environment descriptor that would have been added. - req[1] = AUTHORITATIVE_CONSTRAINTS[req] + req = (req[0], AUTHORITATIVE_CONSTRAINTS[req[0]]) subprocess.check_call(['hashin', '{0}=={1}'.format(req[0], req[1]), '--requirements-file', dest_file])