Handling curl ssl a bit better.

Dalekamistoso · May 7, 2023 · 47688aa · 47688aa
1 parent 7999a28
commit 47688aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/update_all/config_reader.py b/src/update_all/config_reader.py
@@ -53,8 +53,8 @@ def fill_config_with_environment_and_mister_section(self, config: Config):
         if is_debug_enabled(self._env):
             config.verbose = True
 
-        config.curl_ssl = valid_max_length(KENV_CURL_SSL, self._env[KENV_CURL_SSL], 50)
-        config.commit = valid_max_length(KENV_COMMIT, self._env[KENV_COMMIT], 50)
+        config.curl_ssl = valid_max_length(KENV_CURL_SSL, self._env[KENV_CURL_SSL], 50).strip()
+        config.commit = valid_max_length(KENV_COMMIT, self._env[KENV_COMMIT], 50).strip()
         config.start_time = time.time()
         config.key_ignore_time = float(self._env[KENV_KEY_IGNORE_TIME])
 

diff --git a/src/update_all/os_utils.py b/src/update_all/os_utils.py
@@ -70,7 +70,9 @@ def sleep(self, seconds) -> None:
 
     def download(self, url) -> Optional[bytes]:
         curl_ssl = self._config_provider.get().curl_ssl
-        curl_command = ["curl", *curl_ssl.split(), "-s", "-L"]
+        curl_command = ["curl", "-s", "-L"]
+        if curl_ssl != "":
+            curl_command.extend(curl_ssl.split())
         if '--retry' not in curl_ssl:
             curl_command.extend(["--retry", "3"])
         if '--connect-timeout' not in curl_ssl: