From 729923d4a2d5a22f6509de438953ef6035d38e20 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sun, 7 Oct 2012 23:15:51 -0700 Subject: Fix bug 372583. Don't add redundant trailing slashes on src uri's where trailing slashes are required. --- layman/overlays/mercurial.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'layman/overlays/mercurial.py') diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index 0d8250e..5034993 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -56,11 +56,16 @@ class MercurialOverlay(OverlaySource): cfg_opts = self.config["mercurial_addopts"] target = path([base, self.parent.name]) + if self.src.endswith("/"): + src = self.src + else: + src = self.src + '/' + # hg clone SOURCE TARGET if len(cfg_opts): - args = ['clone', cfg_opts, self.src + '/', target] + args = ['clone', cfg_opts, src, target] else: - args = ['clone', self.src + '/', target] + args = ['clone', src, target] return self.postsync( self.run_command(self.command(), args, cmd=self.type), -- cgit v1.2.3-1-g7c22