Permalink
Browse files

Merge pull request #11 from elemoine/listrun

fix bug in list_run where the generated URLs include %5C characters
  • Loading branch information...
2 parents a865930 + 2c43384 commit 016a7600690a74890ba9b70416197a87d9ea188a Éric Lemoine committed Feb 27, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 jstools/merge.py
View
@@ -324,8 +324,8 @@ def __init__(self, root_dir, sourcedir, filepath, exclude, depmap=None):
"""
"""
self.filepath = filepath
- self.fullpath = os.path.join(sourcedir, filepath)
- self.abspath = os.path.join(root_dir, self.fullpath)
+ self.fullpath = '/'.join([sourcedir.rstrip('/'), filepath])
+ self.abspath = os.path.join(root_dir, os.path.normpath(self.fullpath))
self.exclude = exclude
self._source = None
self._requires = _marker

0 comments on commit 016a760

Please sign in to comment.