update changelog

caomw · Oct 8, 2015 · 1db7cb4 · 1db7cb4
1 parent ecd3901
commit 1db7cb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,8 @@
   * Avoid issues with LookupErrors when updating Python in the root
     environment on Windows
   * Don't fetch the index from the network with conda remove
+  * when installing conda packages directly, "conda install <pkg>.tar.bz2",
+    unlink any installed package with that name (not just the installed one)
 
 
 2015-09-28   3.18.1:

diff --git a/tests/test_toposort.py b/tests/test_toposort.py
@@ -44,9 +44,9 @@ def test_python_is_prioritized(self):
         """
         This test checks a special invariant related to 'python' specifically.
         Python is part of a cycle (pip <--> python), which can cause it to be
-        installed *after* packages that need python (possibly in 
+        installed *after* packages that need python (possibly in
         post-install.sh).
-        
+
         A special case in toposort() breaks the cycle, to ensure that python
         isn't installed too late.  Here, we verify that it works.
         """