moinsetup

Changeset

15:866ec2faae57
2010-05-26 Paul Boddie raw files shortlog changelog graph Fixed URL path normalisation.
TO_DO.txt (file) moinsetup.py (file)
     1.1 --- a/TO_DO.txt	Wed May 26 02:06:08 2010 +0200
     1.2 +++ b/TO_DO.txt	Wed May 26 02:21:43 2010 +0200
     1.3 @@ -1,3 +1,4 @@
     1.4 +Avoid reconfiguration of existing moin script.
     1.5  Site directory detection.
     1.6  Enabled/available site listings.
     1.7  HTTP user integration and Apache user/group file editing.
     2.1 --- a/moinsetup.py	Wed May 26 02:06:08 2010 +0200
     2.2 +++ b/moinsetup.py	Wed May 26 02:21:43 2010 +0200
     2.3 @@ -205,7 +205,7 @@
     2.4  
     2.5          # Strip any trailing "/" from the URL path.
     2.6  
     2.7 -        if url_path.endswith("/"):
     2.8 +        if url_path != "/" and url_path.endswith("/"):
     2.9              self.url_path = url_path[:-1]
    2.10          else:
    2.11              self.url_path = url_path
    2.12 @@ -404,7 +404,7 @@
    2.13              # /         -> /moin_static187
    2.14              # /hgwiki   -> /hgwiki/moin_static187
    2.15  
    2.16 -            self.static_url_path = self.url_path + "/" + self.get_static_identifier()
    2.17 +            self.static_url_path = self.url_path + (self.url_path != "/" and "/" or "") + self.get_static_identifier()
    2.18              url_prefix_static = "%r" % self.static_url_path
    2.19  
    2.20          # Copy the Wiki configuration file from the distribution.