From 2295fcbbaa57f13a838a2f18714b17d0b755cb2f Mon Sep 17 00:00:00 2001 From: Bogdano Arendartchuk Date: Tue, 5 Feb 2008 20:47:58 +0000 Subject: Fixed the use of file:/// URLs when using just the package name --- RepSys/command.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'RepSys/command.py') diff --git a/RepSys/command.py b/RepSys/command.py index 8029e08..1833bcd 100644 --- a/RepSys/command.py +++ b/RepSys/command.py @@ -1,6 +1,7 @@ #!/usr/bin/python from RepSys import Error, config -import sys, os, urllib +import sys, os +import urlparse import optparse __all__ = ["OptionParser", "do_command", "default_parent"] @@ -46,8 +47,9 @@ def default_parent(url): if not default_parent: raise Error, "received a relative url, " \ "but default_parent was not setup" - type, rest = urllib.splittype(default_parent) - url = type+':'+os.path.normpath(rest+'/'+url) + parsed = list(urlparse.urlparse(default_parent)) + parsed[2] = os.path.normpath(parsed[2] + "/" + url) + url = urlparse.urlunparse(parsed) return url # vim:et:ts=4:sw=4 -- cgit v1.2.1 From f49336398f7cd227b11a873954bf89967c84502a Mon Sep 17 00:00:00 2001 From: Bogdano Arendartchuk Date: Tue, 11 Nov 2008 16:47:58 +0000 Subject: Handle keyboard interruputs There is no need to spit out a traceback for it. --- RepSys/command.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'RepSys/command.py') diff --git a/RepSys/command.py b/RepSys/command.py index 1833bcd..f1d61f7 100644 --- a/RepSys/command.py +++ b/RepSys/command.py @@ -40,6 +40,10 @@ def do_command(parse_options_func, main_func): except Error, e: sys.stderr.write("error: %s\n" % str(e)) sys.exit(1) + except KeyboardInterrupt: + sys.stderr.write("interrupted\n") + sys.stderr.flush() + sys.exit(1) def default_parent(url): if url.find("://") == -1: -- cgit v1.2.1