From c008e5a5af78107412073c8cf8c2757c86f6d3fe Mon Sep 17 00:00:00 2001 From: Andrew Mahone Date: Thu, 22 May 2008 20:05:34 -0400 Subject: [PATCH] fixed usage printing, added PIL, mutagen to deps --- audiomangler/cli.py | 8 ++++++-- setup.py | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/audiomangler/cli.py b/audiomangler/cli.py index 02e45e6..31e1b60 100644 --- a/audiomangler/cli.py +++ b/audiomangler/cli.py @@ -15,7 +15,7 @@ from audiomangler import scan, Config, util, sync_sets def parse_options(args = None, options = []): if args is None and len(sys.argv) == 1: - print_usage(transcode_opts) + print_usage(options) sys.exit(0) if args == None: args = sys.argv[1:] @@ -30,7 +30,11 @@ def parse_options(args = None, options = []): name_map['--'+l_opt.rstrip('=')] = name l_opts.append(l_opt) s_opts = ''.join(s_opts) - (opts, args) = getopt.getopt(args,s_opts,l_opts) + try: + (opts, args) = getopt.getopt(args,s_opts,l_opts) + except getopt.GetoptError: + print_usage(options) + sys.exit(0) for k,v in opts: k = name_map[k] Config[k] = v diff --git a/setup.py b/setup.py index 27523f5..4438e8a 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,8 @@ setup( package_dir={'audiomangler': 'audiomangler'}, install_requires=''' pyparsing >= 1.4.11 + PIL >= 1.1.6 + mutagen >= 1.13 ''', entry_points={ 'console_scripts': [ -- 2.11.4.GIT