native_path_to_unix can return None

Signed-off-by: Kale Franz <[email protected]>
mukteshkrmishra · Jun 15, 2018 · b303fcc · b303fcc
1 parent 20c28df
commit b303fcc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/conda/activate.py b/conda/activate.py
@@ -517,7 +517,7 @@ def native_path_to_unix(paths):  # pragma: unix no cover
     # on windows, uses cygpath to convert windows native paths to posix paths
     if not on_win:
         return path_identity(paths)
-    elif paths is None:
+    if paths is None:
         return None
     from subprocess import CalledProcessError, PIPE, Popen
     from shlex import split

diff --git a/conda/base/constants.py b/conda/base/constants.py
@@ -163,6 +163,7 @@ class UpdateModifier(Enum):
     UPDATE_DEPS = 'update_deps'
     UPDATE_SPECS = 'update_specs'  # default
     UPDATE_ALL = 'update_all'
+    # TODO: add REINSTALL_ALL, see https://github.com/conda/conda/issues/6247 and https://github.com/conda/conda/issues/3149  # NOQA
 
     def __str__(self):
         return self.value