Issue #246

--HG--
branch : distribute
extra : rebase_source : e14172505ff8938f00f51de4f29a8fb2834ac933

setup.cfg

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

setuptools/command/upload.py

@@ -228,8 +228,10 @@ if sys.version >= "2.5":
                                 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