From 466cf3ba33fcd2393d83db28bd949e1fd97e794f Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 16 Apr 2013 23:07:38 +0200 Subject: [PATCH] deps: Rename --list-deps to --show-deps --- docs/changelog.rst | 3 +++ docs/running.rst | 4 ++-- docs/troubleshooting.rst | 2 +- mopidy/__main__.py | 6 +++--- mopidy/utils/deps.py | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index a2a73dd3..6a4ab026 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -55,6 +55,9 @@ and improved. - The command option :option:`mopidy --list-settings` is now named :option:`mopidy --show-config`. +- The command option :option:`mopidy --list-deps` is now named + :option:`mopidy --show-deps`. + - What configuration files to use can now be specified through the command option :option:`mopidy --config`. diff --git a/docs/running.rst b/docs/running.rst index 58f7d591..7e0bacbb 100644 --- a/docs/running.rst +++ b/docs/running.rst @@ -52,9 +52,9 @@ mopidy command together to show the effective document. Secret values like passwords are masked out. Config for disabled extensions are not included. -.. cmdoption:: --list-deps +.. cmdoption:: --show-deps - List dependencies and their versions. + Show dependencies, their versions and installation location. .. cmdoption:: --config diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 0c0f10da..66b942c9 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -27,7 +27,7 @@ with others for debugging. Installed dependencies ====================== -The command :option:`mopidy --list-deps` will list the paths to and versions of +The command :option:`mopidy --show-deps` will list the paths to and versions of any dependency Mopidy or the extensions might need to work. This is very useful data for checking that you're using the right versions, and that you're using the right installation if you have multiple installations of a dependency on diff --git a/mopidy/__main__.py b/mopidy/__main__.py index cd082b9f..d2df7f81 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -120,9 +120,9 @@ def parse_options(): action='callback', callback=show_config_callback, help='show current config') parser.add_option( - b'--list-deps', - action='callback', callback=deps.list_deps_optparse_callback, - help='list dependencies and their versions') + b'--show-deps', + action='callback', callback=deps.show_deps_optparse_callback, + help='show dependencies and their versions') parser.add_option( b'--config', action='store', dest='config', diff --git a/mopidy/utils/deps.py b/mopidy/utils/deps.py index b1e9c508..742536a5 100644 --- a/mopidy/utils/deps.py +++ b/mopidy/utils/deps.py @@ -14,11 +14,11 @@ import pkg_resources from . import formatting -def list_deps_optparse_callback(*args): +def show_deps_optparse_callback(*args): """ Prints a list of all dependencies. - Called by optparse when Mopidy is run with the :option:`--list-deps` + Called by optparse when Mopidy is run with the :option:`--show-deps` option. """ print format_dependency_list()