aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2008-11-07 19:33:37 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2008-11-07 19:33:37 +0000
commitc73f73140fe3d18287a50bc04fd367e08e8e0ba8 (patch)
treef2610ba5914738439c255f229fa17461ec0f45b9
parent487539a7a081c72c8414efe4026f104ff6d92ac3 (diff)
downloadmgarepo-c73f73140fe3d18287a50bc04fd367e08e8e0ba8.tar
mgarepo-c73f73140fe3d18287a50bc04fd367e08e8e0ba8.tar.gz
mgarepo-c73f73140fe3d18287a50bc04fd367e08e8e0ba8.tar.bz2
mgarepo-c73f73140fe3d18287a50bc04fd367e08e8e0ba8.tar.xz
mgarepo-c73f73140fe3d18287a50bc04fd367e08e8e0ba8.zip
Changed repsys submit to use the parent URL when working on mirror
checkouts
-rw-r--r--RepSys/mirror.py4
-rw-r--r--RepSys/rpmutil.py3
2 files changed, 7 insertions, 0 deletions
diff --git a/RepSys/mirror.py b/RepSys/mirror.py
index 09d72de..f0d2316 100644
--- a/RepSys/mirror.py
+++ b/RepSys/mirror.py
@@ -81,6 +81,10 @@ def switchto_parent(svn, url, path):
newurl = mirror_relocate(mirror_url(), layout.repository_url(), url, path)
return newurl
+def switchto_parent_url(url):
+ newurl = relocate_path(mirror_url(), layout.repository_url(), url)
+ return newurl
+
def switchto_mirror(svn, url, path):
newurl = mirror_relocate(layout.repository_url(), mirror_url(), url, path)
return newurl
diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py
index d0be054..ab85fab 100644
--- a/RepSys/rpmutil.py
+++ b/RepSys/rpmutil.py
@@ -573,6 +573,9 @@ def get_submit_info(path):
max = rev
if max == -1:
raise Error, "revision tag not found in 'svn info' output"
+
+ if mirror.using_on(url):
+ url = mirror.switchto_parent_url(url)
return name, url, max