From d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21 Mon Sep 17 00:00:00 2001 From: Bogdano Arendartchuk Date: Thu, 17 Jul 2008 12:23:33 +0000 Subject: Pulled a couple of get_submit_info fixes --- RepSys/commands/submit.py | 8 +++++--- RepSys/rpmutil.py | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'RepSys') diff --git a/RepSys/commands/submit.py b/RepSys/commands/submit.py index f1726dc..f2f1cdb 100644 --- a/RepSys/commands/submit.py +++ b/RepSys/commands/submit.py @@ -62,9 +62,11 @@ def parse_options(): parser.add_option("--define", action="append") opts, args = parser.parse_args() if not args: - name, rev = get_submit_info(".") - args = name, str(rev) - print "submitting %s at revision %s..." % args + name, url, rev = get_submit_info(".") + args = url, str(rev) + #FIXME bad place for output + print "Submitting %s at revision %s" % (name, rev) + print "URL: " + url elif len(args) > 2: raise Error, "invalid arguments" opts.pkgdirurl = default_parent(args[0]) diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py index 3bb1b50..c883cd7 100644 --- a/RepSys/rpmutil.py +++ b/RepSys/rpmutil.py @@ -545,6 +545,7 @@ def get_submit_info(path): if len(toks) < 2 or toks[-1] != "current": raise Error, "unexpected URL received from 'svn info'" name = toks[-2] + url = "/".join(toks[:-1]) # Finally, guess revision. max = -1 @@ -563,6 +564,6 @@ def get_submit_info(path): if max == -1: raise Error, "revision tag not found in 'svn info' output" - return name, max + return name, url, max # vim:et:ts=4:sw=4 -- cgit v1.2.1