Commits

Anonymous committed 8d1cb51

Issue #246

  • Participants
  • Parent commits 70f071b

Comments (0)

Files changed (2)

 [egg_info]
-tag_build = dev
+tag_build = 
 tag_svn_revision = 1
 
 [aliases]

File setuptools/command/upload.py

                                 current[key] = config.get(server, key)
                             else:
                                 current[key] = default
+                        # Issue #246, handling url ambiguity
                         if (current['server'] == repository or
-                            current['repository'] == repository):
+                            current['repository'] == repository or
+                            (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)):
                             return current
                 elif 'server-login' in sections:
                     # old format