summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2010-04-08 10:09:18 +0200
committerSebastian Pipping <sebastian@pipping.org>2010-04-08 10:14:46 +0200
commitbcc193c6e2a30ad8b22c6bdb239f63187b10151c (patch)
tree653ef440fb9b686bda2724a94e522f7f0a1b4ae1
parent3e3202109cf033b56a54917510cd338f7389a8e5 (diff)
downloadlayman-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--CHANGES2
-rw-r--r--layman/overlays/svn.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 6061356..65f6170 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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?'''