diff options
| author | Brian Dolbec <dolsen@gentoo.org> | 2012-10-07 23:15:51 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2012-10-07 23:15:51 -0700 |
| commit | 729923d4a2d5a22f6509de438953ef6035d38e20 (patch) | |
| tree | 531bb1dbba640b7c7c4d233d9f8286ff51a6a67d /layman/overlays/mercurial.py | |
| parent | 25da05250a60d1bae9a03eadb8db4eb744cc4ae0 (diff) | |
| download | layman-729923d4a2d5a22f6509de438953ef6035d38e20.tar.gz layman-729923d4a2d5a22f6509de438953ef6035d38e20.tar.bz2 layman-729923d4a2d5a22f6509de438953ef6035d38e20.zip | |
Fix bug 372583. Don't add redundant trailing slashes on src uri's where trailing slashes are required.
Diffstat (limited to 'layman/overlays/mercurial.py')
| -rw-r--r-- | layman/overlays/mercurial.py | 9 |
1 files changed, 7 insertions, 2 deletions
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), |