1.1 --- a/moinsetup.py Thu Jul 01 00:15:27 2010 +0200
1.2 +++ b/moinsetup.py Thu Jul 01 00:47:02 2010 +0200
1.3 @@ -297,7 +297,7 @@
1.4 except IOError:
1.5 f = os.popen("%s -c 'from MoinMoin.version import release; print release'" % sys.executable)
1.6 try:
1.7 - return f.read()
1.8 + return f.read().strip()
1.9 finally:
1.10 f.close()
1.11 finally:
1.12 @@ -460,7 +460,7 @@
1.13 # / -> /moin_static187
1.14 # /hgwiki -> /hgwiki/moin_static187
1.15
1.16 - self.static_url_path = self.url_path + (self.url_path != "/" and "/" or "") + self.get_static_identifier()
1.17 + self.static_url_path = self.url_path + (self.url_path != "/" and "-" or "") + self.get_static_identifier()
1.18 url_prefix_static = "%r" % self.static_url_path
1.19
1.20 # Copy the Wiki configuration file from the distribution.