From e3f9489aa5b33f1106df010e2a1fb7fa42523e3b Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 7 Jun 2018 11:08:50 +0200 Subject: [PATCH] Revert "minor cleanup" This reverts commit b86ab178ebea540b395f8768147c85100a184668. --- src/pip/_internal/download.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py index 2f97393978d..608bcf12cec 100644 --- a/src/pip/_internal/download.py +++ b/src/pip/_internal/download.py @@ -74,7 +74,6 @@ def __init__(self, path_to_tuf_config_file): function: { - "enable_logging": true, "repositories_dir": "repositories", "repository_dir": "repository-name", "target_path_patterns": ["^.*/(wheels/.*\\.whl)$"], @@ -92,22 +91,27 @@ def __init__(self, path_to_tuf_config_file): with open(path_to_tuf_config_file) as tuf_config_file: tuf_config = json.load(tuf_config_file) - # NOTE: By default, we turn off TUF logging, and use the pip log - # instead. - tuf.settings.ENABLE_FILE_LOGGING = tuf_config.get('enable_logging', - False) + # Reconfigure TUF logging, we can use the pip log output + tuf.settings.ENABLE_FILE_LOGGING = tuf_config.get('enable_logging', False) # NOTE: The directory where TUF metadata for *all* repositories are # kept. - tuf.settings.repositories_directory = tuf_config['repositories_dir'] + if os.path.isabs(tuf_config['repositories_dir']): + tuf.settings.repositories_directory = tuf_config['repositories_dir'] + else: + tuf.settings.repositories_directory = os.path.join( + os.path.dirname(path_to_tuf_config_file), + tuf_config['repositories_dir'] + ) # NOTE: Tell TUF where SSL certificates are kept. tuf.settings.ssl_certificates = certifi.where() + # NOTE: The directory where the targets for *this* repository is # cached. We hard-code this keep this to a subdirectory dedicated to # this repository. - self.__targets_dir = os.path.join(tuf_config['repositories_dir'], + self.__targets_dir = os.path.join(tuf.settings.repositories_directory, tuf_config['repository_dir'], 'targets') @@ -170,6 +174,7 @@ def download(self, target_relpath, dest_dir, dest_filename): if 'TUF_CONFIG_FILE' in os.environ: import certifi import tuf.settings + tuf.settings.ENABLE_FILE_LOGGING = False from tuf.client.updater import Updater