opendev/system-config
Code Issues Proposed changes

Further fixes for bandersnatch

Browse Source 
There are a couple of edge cases with the recent PEP503 workaround
where packages with both .'s and -'s in the name are unable to be
translated to their old 'safe names'.

Add specific workarounds for known packages.

Change-Id: I72bbdd4af7200f8565d7c6b7fa6d3f268c783b24
This commit is contained in:
Joshua Hesketh 2016-05-11 20:29:02 +10:00
parent c640ca2d97
commit ce7d4b3748
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/openstack_project/templates/mirror.vhost.erb
View File

@ -53,10 +53,20 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
# TODO(jhesketh): Remove this after bandersnatch implements pep503
# https://bitbucket.org/pypa/bandersnatch/pull-requests/20/fully-implement-pep-503-normalization/diff
# Special cases for openstack.nose_plugin & backports.*
RewriteRule ^(.*)/openstack-nose-plugin(.*)$ $1/openstack.nose_plugin$2
RewriteRule ^(.*)/backports-(.*)$ $1/backports.$2
RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*)
RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d
RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L]
# Try again but replacing -'s with .'s
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-f
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d
RewriteRule (.*)-(.*) $1.$2
RewriteRule (.*)-(.*) $1.$2 [N]
RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*)
RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d
RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L]