Merge branch 'dev'

thoughtspot · Jul 29, 2024 · dc3fd18 · dc3fd18
2 parents 4c4a814 + 54c27a2
commit dc3fd18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cs_tools/updater/_bootstrapper.py b/cs_tools/updater/_bootstrapper.py
@@ -204,7 +204,7 @@ def cli():
             )
 
     except Exception:
-        pass
+        raise
 
     else:
         _cleanup()
@@ -255,7 +255,8 @@ def _setup_logging(verbose=True):
     import pathlib
     import tempfile
 
-    random_name = tempfile.NamedTemporaryFile().name
+    temp_fpname = tempfile.NamedTemporaryFile().name
+    random_name = pathlib.Path(temp_fpname).name
     random_path = pathlib.Path.cwd().joinpath("cs_tools-bootstrap-error-{n}.log".format(n=random_name))
 
     config = {
@@ -568,7 +569,7 @@ def main():
         log.debug("Error found: {err}".format(err=e), exc_info=True)
         log.warning(
             "Unexpected error in bootstrapper, see {b}{logfile}{x} for details..".format(
-                b=_BLUE, logfile=disk_handler.baseFilename, x=_RESET
+                b=_BLUE, logfile=disk_handler.baseFilename, x=_YELLOW
             )
         )
         return_code = 1

diff --git a/cs_tools/updater/_updater.py b/cs_tools/updater/_updater.py
@@ -198,7 +198,7 @@ def pip(self, command: str, *args, with_system_python: bool = False, **kwargs) -
         # TODO: proxy = get from ENVVAR ?
         # required_general_args = (*required_general_args, "--proxy", "scheme://[user:passwd@]proxy.server:port")
 
-        if command == "install" and self.offline_directory is not None:
+        if command == "install" and self.offline_directory:
             # override incoming args
             # fmt: off
             args = (