update changelog

CHANGELOG.txt

@@ -2,6 +2,8 @@
 --------------------
   * added a pruning step for more efficient solves, #1702
   * disallow conda-env to be installed into non-root environment
+  * improve error output for bad command input, #1706
+  * pass env name and setup cmd to menuinst, #1699
 
 
 2015-10-12   3.18.2:

conda/resolve.py

@@ -433,7 +433,7 @@ def prune_packages(self, specs):
         def filter_group(matches):
             match1 = next(x for x in matches)
             name = match1.name
-            
+
             first = False
             nold = nnew = 0
             group = self.groups[name]
@@ -517,7 +517,7 @@ def find_matches(self, ms, all=True):
                 yield fn
 
     def ms_depends(self, fn):
-        # We can't use @memoize here because this cache is modified 
+        # We can't use @memoize here because this cache is modified
         # in update_with_features as well
         try:
             res = self.msd_cache[fn]
@@ -598,7 +598,7 @@ def add_dependents(fn1, max_only=False):
         return res
 
     def gen_clauses(self, v, dists, specs, features):
-        groups = defaultdict(list)  # map name to list of filenames  
+        groups = defaultdict(list)  # map name to list of filenames
         for fn in dists:
             groups[self.index[fn]['name']].append(fn)