summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2010-01-01 01:39:33 +0100
committerSebastian Pipping <sebastian@pipping.org>2010-01-01 01:39:33 +0100
commit13b8a3969b3fcba55b25d2b593c78abf708fec06 (patch)
treea68a7a875c73f6331d62012f7ad07a19ee0da144
parent04a856b8773f0838dcf0fd595b3869402cde769b (diff)
downloadlayman-13b8a3969b3fcba55b25d2b593c78abf708fec06.tar.gz
layman-13b8a3969b3fcba55b25d2b593c78abf708fec06.tar.bz2
layman-13b8a3969b3fcba55b25d2b593c78abf708fec06.zip
Fix handling of names containing '@' for Subversion overlays
-rw-r--r--CHANGES3
-rw-r--r--layman/overlays/svn.py8
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?'''