aboutsummaryrefslogtreecommitdiffstats
path: root/RepSys
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2008-07-17 12:23:33 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2008-07-17 12:23:33 +0000
commitd8ba6ea3b5d5dc7a80050cf4955e7588609a1d21 (patch)
tree39f6e0ff91cd2124b201d43a6ada7dd070e5d438 /RepSys
parenta60d9424ddc243acd1c1bd291e7a3f334b7b2ba1 (diff)
downloadmgarepo-d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21.tar
mgarepo-d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21.tar.gz
mgarepo-d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21.tar.bz2
mgarepo-d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21.tar.xz
mgarepo-d8ba6ea3b5d5dc7a80050cf4955e7588609a1d21.zip
Pulled a couple of get_submit_info fixes
Diffstat (limited to 'RepSys')
-rw-r--r--RepSys/commands/submit.py8
-rw-r--r--RepSys/rpmutil.py3
2 files changed, 7 insertions, 4 deletions
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