- added workaround for #23251 (don't ask for password if not needed)

- fixed svn's output parsing, this changed in more recent versions (doesn't
  affect Mandriva because we use svn+ssh, not https)

3 files changed, 10 insertions, 3 deletions

diff --git a/RepSys/commands/markrelease.py b/RepSys/commands/markrelease.py
index 054fff0..fa66f9b 100644
--- a/RepSys/commands/markrelease.py
+++ b/RepSys/commands/markrelease.py
@@ -87,7 +87,6 @@ def parse_options():
         raise Error, "no revision provided"
     elif not opts.version:
         raise Error, "no version provided"
-    get_auth()
     return opts
 
 def main():
diff --git a/RepSys/rpmutil.py b/RepSys/rpmutil.py
index 48efd1c..c276ef3 100644
--- a/RepSys/rpmutil.py
+++ b/RepSys/rpmutil.py
@@ -4,11 +4,13 @@ from RepSys.svn import SVN
 from RepSys.rpm import SRPM
 from RepSys.log import specfile_svn2rpm
 from RepSys.util import execcmd
+from RepSys.util import get_auth
 import tempfile
 import shutil
 import glob
 import sys
 import os
+import urllib
 
 def get_spec(pkgdirurl, targetdir="."):
     svn = SVN()
@@ -238,7 +240,13 @@ def create_package(pkgdirurl, log="", verbose=0):
             shutil.rmtree(tmpdir)
 
 def mark_release(pkgdirurl, version, release, revision):
-    svn = SVN()
+    auth = ()
+    type, rest = urllib.splittype(pkgdirurl)
+    if type == "https":
+        auth = get_auth()
+
+    svn = SVN(*auth)
+
     releasesurl = "/".join([pkgdirurl, "releases"])
     versionurl = "/".join([releasesurl, version])
     releaseurl = "/".join([versionurl, release])
diff --git a/RepSys/svn.py b/RepSys/svn.py
index 6a42e6d..6919070 100644
--- a/RepSys/svn.py
+++ b/RepSys/svn.py
@@ -38,7 +38,7 @@ class SVN:
         outlist = []
         while True:
             i = p.expect_exact([pexpect.EOF, pexpect.TIMEOUT,
-                    "username:", "password:",
+                    "Username:", "Password for '%s':" % self.username,
                     "(p)ermanently?",
                     "Authorization failed"])
             if i == 0: