[121172] branches/gsoc14-pip2port/pypi2port

[gaurav at macports.org]

Revision: 121172
          https://trac.macports.org/changeset/121172
Author:   gaurav at macports.org
Date:     2014-06-19 02:36:59 -0700 (Thu, 19 Jun 2014)
Log Message:
-----------
Updated executable

Modified Paths:
--------------
    branches/gsoc14-pip2port/pypi2port

Modified: branches/gsoc14-pip2port/pypi2port
===================================================================
--- branches/gsoc14-pip2port/pypi2port	2014-06-19 09:35:54 UTC (rev 121171)
+++ branches/gsoc14-pip2port/pypi2port	2014-06-19 09:36:59 UTC (rev 121172)
@@ -273,13 +273,18 @@
         else:
             file.write('homepage            {0}\n'.format(os.getenv('home_page','')))
             
-
-        if dict2:
-            master_site = '/'.join(dict2[0]['url'].split('/')[0:-1])
-        else:
-            master_site = os.getenv('master_site','')
+        try:
+            master_site = dict['release_url']
+        except:
+            if dict2:
+                master_site = '/'.join(dict2[0]['url'].split('/')[0:-1])
+            else:
+                master_site = os.getenv('master_site','')
         if master_site:
             file.write('master_sites        {0}\n'.format(master_site))
+            master_site_exists = True
+        else:
+            master_site_exists = False
 #        file.write('distname            py-{0}{1}\n\n'.format(
 #                   dict['name'], dict['version']))
         checksums_values = checksums(dict['name'], dict['version'])
@@ -305,10 +310,13 @@
                 file.write('                        port:py-{0}\n'.format(dep))
         file.write('\n')
         file.write('    livecheck.type      none\n')
-        file.write('} else {\n')
-        file.write('    livecheck.type      regex\n')
-        file.write('    livecheck.url       ${master_sites}\n')
-        file.write('}\n')
+        if master_site_exists:
+            file.write('} else {\n')
+            file.write('    livecheck.type      regex\n')
+            file.write('    livecheck.url       ${master_sites}\n')
+            file.write('}\n')
+        else:
+            file.write('}\n')
 
 
 def print_portfile(pkg_name, pkg_version=None):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140619/536f7275/attachment.html>