Use canonical_channel_name in conda list

conda/cli/common.py

@@ -332,3 +332,16 @@ def stdout_json(d):
     sys.stdout.write('\n')
 
 root_no_rm = 'python', 'pycosat', 'pyyaml', 'conda'
+
+def canonical_channel_name(channel):
+    if channel is None:
+        return '<unknown>'
+    channel_alias = config.rc.get('channel_alias', config.DEFAULT_CHANNEL_ALIAS)
+    if channel.startswith(channel_alias):
+        return channel.split(channel_alias, 1)[1].split('/')[0]
+    elif any(channel.startswith(i) for i in config.get_default_urls()):
+        return 'defaults'
+    elif channel.startswith('http://filer/'):
+        return 'filer'
+    else:
+        return channel

conda/cli/main_list.py

@@ -149,7 +149,7 @@ def list_packages(prefix, regex=None, format='human', piplist=False):
             disp = '%(name)-25s %(version)-15s %(build)15s' % info
             disp += '  %s' % common.disp_features(features)
             if config.show_channel_urls:
-                disp += '  %s' % info.get('url', '?')
+                disp += '  %s' % common.canonical_channel_name(info.get('url'))
             print(disp)
         except: # (IOError, KeyError, ValueError):
             print('%-25s %-15s %15s' % tuple(dist.rsplit('-', 2)))

conda/cli/main_search.py

@@ -78,27 +78,12 @@ def configure_parser(sub_parsers):
     common.add_parser_channels(p)
     p.set_defaults(func=execute)
 
-
-# XXX: Should this go in the library code somewhere:
-def canonical_channel_name(channel):
-    if channel is None:
-        return '<unknown>'
-    channel_alias = config.rc.get('channel_alias', config.DEFAULT_CHANNEL_ALIAS)
-    if channel.startswith(channel_alias):
-        return channel.split(channel_alias, 1)[1].split('/')[0]
-    elif any(channel.startswith(i) for i in config.get_default_urls()):
-        return 'defaults'
-    elif channel.startswith('http://filer/'):
-        return 'filer'
-    else:
-        return channel
-
 def execute(args, parser):
     import re
 
     from conda.api import get_index
     from conda.resolve import MatchSpec, Resolve
-
+    from conda.common import canonical_channel_name
 
     if args.regex:
         pat = re.compile(args.regex, re.I)