<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-contrib.
</pre>
<p><a href="https://github.com/macports/macports-contrib/commit/4e62e4a75d2b75ff9687fa751bee8e17e71b7825">https://github.com/macports/macports-contrib/commit/4e62e4a75d2b75ff9687fa751bee8e17e71b7825</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4e62e4a75d2b75ff9687fa751bee8e17e71b7825
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Thu Aug 17 17:19:13 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> pypi2port: Fix generating URLs in master_sites
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the pypi: fetch group for release URLs hosted on pypi itself.
</span>---
pypi2port/pypi2port.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pypi2port/pypi2port.py b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;color:#808080;'>index 1786c21..af9831c 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -556,9 +556,11 @@ def create_portfile(dict, file_name, dict2):
</span> zip_set = False
if master_site:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_site = re.sub('^https?://pypi.python.org/packages/source/', 'pypi:', master_site)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write('master_sites {0}\n'.format(master_site))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_site_exists = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if re.match('^https?://pypi.python.org/packages/', master_site):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('master_sites pypi:{0}/{1}\n'.format(dict['name'][0], dict['name']))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('master_sites {0}\n'.format(master_site))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_site_exists = True
</span> else:
master_site_exists = False
</pre><pre style='margin:0'>
</pre>