From 13b8a3969b3fcba55b25d2b593c78abf708fec06 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 1 Jan 2010 01:39:33 +0100 Subject: Fix handling of names containing '@' for Subversion overlays --- CHANGES | 3 +++ layman/overlays/svn.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f84232d..afb2834 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,9 @@ TODO - Allow running VCS from PATH (fixes #280539) + - Fix handling of Subversion overlays whose name contains + one or more '@' characters (#295018) + Version 1.2.4 - Released 2009/12/05 =================================== diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index 12a2b0c..ca9db80 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -55,8 +55,8 @@ class SvnOverlay(Overlay): else: quiet_option = '' - return self.cmd(self.command() + ' co ' + quiet_option + '"' + self.src + '/" "' + - path([base, self.name]) + '"') + return self.cmd(self.command() + ' co ' + quiet_option + + '"' + self.src + '/@" "' + path([base, self.name]) + '"') def sync(self, base, quiet = False): '''Sync overlay.''' @@ -68,8 +68,8 @@ class SvnOverlay(Overlay): else: quiet_option = '' - return self.cmd(self.command() + ' up ' + quiet_option + '"' + path([base, self.name]) + - '"') + return self.cmd(self.command() + ' up ' + quiet_option + + '"' + path([base, self.name + '@']) + '"') def supported(self): '''Overlay type supported?''' -- cgit v1.2.3-1-g7c22