diff options
author | Sebastian Pipping <sebastian@pipping.org> | 2010-04-08 10:09:18 +0200 |
---|---|---|
committer | Sebastian Pipping <sebastian@pipping.org> | 2010-04-08 10:14:46 +0200 |
commit | bcc193c6e2a30ad8b22c6bdb239f63187b10151c (patch) | |
tree | 653ef440fb9b686bda2724a94e522f7f0a1b4ae1 | |
parent | Extend change log for bug #311419 (diff) | |
download | layman-bcc193c6e2a30ad8b22c6bdb239f63187b10151c.tar.gz layman-bcc193c6e2a30ad8b22c6bdb239f63187b10151c.tar.bz2 layman-bcc193c6e2a30ad8b22c6bdb239f63187b10151c.zip |
Fix syncing of SVN overlays for users of SVN <1.6.5 (bug #313303)
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | layman/overlays/svn.py | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -4,6 +4,8 @@ CHANGES Version TODO =================================== + - Fix syncing of SVN overlays for users of SVN <1.6.5 (bug #313303) + - Fix handling of empty XML entities (bug #309617) - Fix missing import (bug #306143) diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index 25392a8..4411a08 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -68,8 +68,16 @@ class SvnOverlay(OverlaySource): else: quiet_option = '' + def checkout_location(): + # Append '@' iff needed + # Keeps users of SVN <1.6.5 happy in more cases (bug #313303) + repo_part = self.parent.name + if self.parent.name.find('@') != -1: + repo_part = repo_part + '@' + return path([base, repo_part]) + return self.cmd(self.command() + ' up ' + quiet_option + - '"' + path([base, self.parent.name + '@']) + '"') + '"' + checkout_location() + '"') def supported(self): '''Overlay type supported?''' |