prefix jon

alexhall · Aug 17, 2016 · dd55e90 · dd55e90
1 parent 29722b0
commit dd55e90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/conda/base/constants.py b/conda/base/constants.py
@@ -66,7 +66,6 @@ def from_sys(cls):
     '~/.conda/condarc.d/',
     '~/.condarc',
     '$CONDA_PREFIX/.condarc',
-    '$CONDA_PREFIX/condarc',
     '$CONDA_PREFIX/condarc.d/',
     '$CONDARC',
 )

diff --git a/tests/test_create.py b/tests/test_create.py
@@ -82,7 +82,7 @@ def run_command(command, prefix, *arguments):
     prefix = escape_for_winpath(prefix)
     arguments = list(map(escape_for_winpath, arguments))
     if command is Commands.CONFIG:
-        command_line = "{0} --file {1} {2}".format(command, join(prefix, 'condarc'), " ".join(arguments))
+        command_line = "{0} --file {1} {2}".format(command, join(prefix+"/", 'condarc'), " ".join(arguments))
     elif command is Commands.SEARCH:
         command_line = "{0} {1}".format(command, " ".join(arguments))
     elif command is Commands.LIST:
@@ -109,7 +109,7 @@ def make_temp_env(*packages, **kwargs):
         with disable_logger('fetch'), disable_logger('dotupdate'):
             try:
                 # try to clear any config that's been set by other tests
-                reset_context([join(prefix, 'condarc')])
+                reset_context([join(prefix+"/", 'condarc')])
                 run_command(Commands.CREATE, prefix, *packages)
                 os.environ["CONDA_ROOT"] = prefix
                 os.environ["CONDA_PREFIX"] = prefix
@@ -121,7 +121,7 @@ def make_temp_env(*packages, **kwargs):
 
 
 def reload_config(prefix):
-    prefix_condarc = join(prefix, 'condarc')
+    prefix_condarc = join(prefix+"/", 'condarc')
     reset_context([prefix_condarc])