# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1277938022 -7200
# Node ID 0ff99cb88bb1e0019aee4e2a0a5b7f478dcafa77
# Parent  fed4e7bc824818bce5d503bdf29ef2ef4ca77fb0
Changed the static URL path to not conflict with the CGI URL path for Wiki
installations using MoinMoin 1.8.x and earlier.

diff -r fed4e7bc8248 -r 0ff99cb88bb1 moinsetup.py
--- a/moinsetup.py	Thu Jul 01 00:15:27 2010 +0200
+++ b/moinsetup.py	Thu Jul 01 00:47:02 2010 +0200
@@ -297,7 +297,7 @@
             except IOError:
                 f = os.popen("%s -c 'from MoinMoin.version import release; print release'" % sys.executable)
                 try:
-                    return f.read()
+                    return f.read().strip()
                 finally:
                     f.close()
         finally:
@@ -460,7 +460,7 @@
             # /         -> /moin_static187
             # /hgwiki   -> /hgwiki/moin_static187
 
-            self.static_url_path = self.url_path + (self.url_path != "/" and "/" or "") + self.get_static_identifier()
+            self.static_url_path = self.url_path + (self.url_path != "/" and "-" or "") + self.get_static_identifier()
             url_prefix_static = "%r" % self.static_url_path
 
         # Copy the Wiki configuration file from the distribution.