As requested by mrl, don't relocate back to mirror after commit

2 files changed, 9 insertions, 10 deletions

diff --git a/CHANGES b/CHANGES
index f2a14fe..fa45585 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
 - changelog: make default.chlog compatible with cheetah-2
 - make "sync" compatible with rpm-4.4.8 behavior
 - "co" don't use mirror when URL is provided
+- "ci" don't relocate back to mirrors after commit (should use switch)
 - fixed use of __import__, incompatible with python2.4 in plugin support
 - fixed bug of wrong paths when using mirrors
 
diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py
index 8cc7034..bd75254 100644
--- a/RepSys/rpmutil.py
+++ b/RepSys/rpmutil.py
@@ -451,16 +451,14 @@ def commit(target=".", message=None):
     if mirrored:
         newurl = mirror.switchto_parent(svn, url, target)
         print "relocated to", newurl
-    try:
-        # we can't use the svn object here because pexpect hides VISUAL
-        mopt = ""
-        if message is not None:
-            mopt = "-m \"%s\"" % message
-        os.system("svn ci %s %s" % (mopt, target))
-    finally:
-        if mirrored:
-            mirror.switchto_mirror(svn, newurl, target)
-            print "relocated back to", url
+    # we can't use the svn object here because pexpect hides VISUAL
+    mopt = ""
+    if message is not None:
+        mopt = "-m \"%s\"" % message
+    os.system("svn ci %s %s" % (mopt, target))
+    if mirrored:
+        print "use \"repsys switch\" in order to switch back to mirror "\
+                "later"
 
 def switch(mirrorurl=None):
     svn  = SVN(noauth=True)