From d36c067b3247bf7dc3102051b088fe744ac74ae0 Mon Sep 17 00:00:00 2001
From: guyroz <none@none>
Date: Thu, 22 Sep 2011 20:50:45 +0300
Subject: Issue #246

--HG--
branch : distribute
extra : rebase_source : e14172505ff8938f00f51de4f29a8fb2834ac933
---
 setuptools/command/upload.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'setuptools/command/upload.py')

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 042fcbb5..1b708943 100755
--- a/setuptools/command/upload.py
+++ b/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
-- 
cgit v1.2.3