diff --git a/Headphones.py b/Headphones.py index 480caf08..10ab2e44 100755 --- a/Headphones.py +++ b/Headphones.py @@ -77,16 +77,16 @@ def main(): args = parser.parse_args() if args.verbose: - headphones.VERBOSE = 2 - elif args.quiet: - headphones.VERBOSE = 0 + headphones.VERBOSE = True + if args.quiet: + headphones.QUIET = True if args.daemon: if sys.platform == 'win32': print "Daemonize not supported under Windows, starting normally" else: - headphones.DAEMON=True - headphones.VERBOSE = False + headphones.DAEMON = True + headphones.QUIET = True if args.pidfile: headphones.PIDFILE = str(args.pidfile) @@ -101,7 +101,7 @@ def main(): try: file(headphones.PIDFILE, 'w').write("pid\n") except IOError, e: - raise SystemExit("Unable to write PID file: %s [%d]" % (e.strerror, e.errno)) + raise SystemExit("Unable to write PID file: %s [%d]", e.strerror, e.errno) else: logger.warn("Not running in daemon mode. PID file creation disabled.") diff --git a/data/interfaces/default/searchresults.html b/data/interfaces/default/searchresults.html index 2c772b41..752e0424 100644 --- a/data/interfaces/default/searchresults.html +++ b/data/interfaces/default/searchresults.html @@ -55,7 +55,6 @@
${result['score']}
%endif - %endfor %endif @@ -71,10 +70,10 @@ <%def name="javascriptIncludes()"> - +