From bcc193c6e2a30ad8b22c6bdb239f63187b10151c Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 8 Apr 2010 10:09:18 +0200
Subject: Fix syncing of SVN overlays for users of SVN <1.6.5 (bug #313303)

---
 CHANGES                |  2 ++
 layman/overlays/svn.py | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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?'''
-- 
cgit v1.2.3-65-gdbad