This commit is contained in:
Miroslav Stampar 2014-02-16 21:57:14 +01:00
parent dfa727cbc5
commit 58eac364a2

View File

@ -224,7 +224,7 @@ class Web:
self._webFileInject(stagerContent, stagerName, directory) self._webFileInject(stagerContent, stagerName, directory)
for match in re.finditer('/', directory): for match in re.finditer('/', directory):
self.webBaseUrl = "%s://%s:%d%s" % (conf.scheme, conf.hostname, conf.port, directory[match.start():]) self.webBaseUrl = "%s://%s:%d%s/" % (conf.scheme, conf.hostname, conf.port, directory[match.start():].rstrip('/'))
self.webStagerUrl = urlparse.urljoin(self.webBaseUrl, stagerName) self.webStagerUrl = urlparse.urljoin(self.webBaseUrl, stagerName)
self.webStagerFilePath = ntToPosixSlashes(os.path.join(directory, stagerName)) self.webStagerFilePath = ntToPosixSlashes(os.path.join(directory, stagerName))
@ -263,7 +263,7 @@ class Web:
uplPage = uplPage or "" uplPage = uplPage or ""
for match in re.finditer('/', directory): for match in re.finditer('/', directory):
self.webBaseUrl = "%s://%s:%d%s" % (conf.scheme, conf.hostname, conf.port, directory[match.start():]) self.webBaseUrl = "%s://%s:%d%s/" % (conf.scheme, conf.hostname, conf.port, directory[match.start():].rstrip('/'))
self.webStagerUrl = urlparse.urljoin(self.webBaseUrl, stagerName) self.webStagerUrl = urlparse.urljoin(self.webBaseUrl, stagerName)
self.webStagerFilePath = ntToPosixSlashes(os.path.join(directory, stagerName)) self.webStagerFilePath = ntToPosixSlashes(os.path.join(directory, stagerName))