Merge branch 'master' of github.com:conda/conda into conda-export-fix

alexhall · Aug 18, 2016 · 75e9a5b · 75e9a5b
2 parents 7fcee28 + 5a8e020
commit 75e9a5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/conda/cli/main_config.py b/conda/cli/main_config.py
@@ -324,7 +324,7 @@ def execute_config(args, parser):
                     # Use repr so that it can be pasted back in to conda config --add
                     if key == "channels" and q in (0, numitems-1):
                         print("--add", key, repr(item),
-                              "  # lowest priority" if q == 0 else "  # highest priority")
+                              "  # highest priority" if q == 0 else "  # lowest priority")
                     else:
                         print("--add", key, repr(item))
 

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -400,8 +400,8 @@ def test_config_command_get():
 --set always_yes True
 --set changeps1 False
 --set channel_alias http://alpha.conda.anaconda.org
---add channels 'test'   # lowest priority
---add channels 'defaults'   # highest priority
+--add channels 'test'   # highest priority
+--add channels 'defaults'   # lowest priority
 --add create_default_packages 'ipython'
 --add create_default_packages 'numpy'\
 """
@@ -411,8 +411,8 @@ def test_config_command_get():
         '--get', 'channels')
 
         assert stdout == """\
---add channels 'test'   # lowest priority
---add channels 'defaults'   # highest priority\
+--add channels 'test'   # highest priority
+--add channels 'defaults'   # lowest priority\
 """
         assert stderr == ""
 
@@ -429,8 +429,8 @@ def test_config_command_get():
 
         assert stdout == """\
 --set changeps1 False
---add channels 'test'   # lowest priority
---add channels 'defaults'   # highest priority\
+--add channels 'test'   # highest priority
+--add channels 'defaults'   # lowest priority\
 """
         assert stderr == ""
 
@@ -489,8 +489,8 @@ def test_config_command_parser():
         assert stdout == """\
 --set always_yes True
 --set changeps1 False
---add channels 'test'   # lowest priority
---add channels 'defaults'   # highest priority
+--add channels 'test'   # highest priority
+--add channels 'defaults'   # lowest priority
 --add create_default_packages 'ipython'
 --add create_default_packages 'numpy'\
 """