Revert 8d1cb51a01b6 because of issue #250

--HG--
branch : distribute
extra : rebase_source : 842a0d796e6e3cd5ecf312dd5c3ff2bb35d601a5

setup.cfg

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

setuptools/command/upload.py

@@ -228,10 +228,7 @@ 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 or
-                            (current['repository'] == "http://www.python.org/pypi" and repository == self.DEFAULT_REPOSITORY)):
+                                if (current['server'] == repository:
                             return current
                 elif 'server-login' in sections:
                     # old format