diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index ab516fc..aed03fb 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -4,6 +4,9 @@ Changelog 1.23 - Unreleased ----------------- +* Fix asking for password for svn with basic authentication. Refs #100 + [MordicusEtCubitus] + * Fixed regressions in svn module. Refs #37 [fschulze, evilbungle (Alan Hoey)] diff --git a/src/mr/developer/svn.py b/src/mr/developer/svn.py index db9a5dd..49e74cc 100644 --- a/src/mr/developer/svn.py +++ b/src/mr/developer/svn.py @@ -200,7 +200,7 @@ def _svn_communicate(self, args, url, **kwargs): stdout, stderr = cmd.communicate() if cmd.returncode != 0: lines = stderr.strip().split(b('\n')) - if 'authorization failed' in lines[-1]: + if 'authorization failed' in lines[-1] or 'Could not authenticate to server' in lines[-1]: raise SVNAuthorizationError(stderr.strip()) if 'Server certificate verification failed: issuer is not trusted' in lines[-1]: cmd = subprocess.Popen(interactive_args,