diff options
| author | guyroz <none@none> | 2011-09-22 20:50:45 +0300 |
|---|---|---|
| committer | guyroz <none@none> | 2011-09-22 20:50:45 +0300 |
| commit | d36c067b3247bf7dc3102051b088fe744ac74ae0 (patch) | |
| tree | c39b19d2f01fb022ac9c4461a47b655b0c0c1a1d /setuptools/command/upload.py | |
| parent | ae7bd543495b7f0bb55ab674df1d01fdb47d1cc4 (diff) | |
| download | external_python_setuptools-d36c067b3247bf7dc3102051b088fe744ac74ae0.tar.gz external_python_setuptools-d36c067b3247bf7dc3102051b088fe744ac74ae0.tar.bz2 external_python_setuptools-d36c067b3247bf7dc3102051b088fe744ac74ae0.zip | |
Issue #246
--HG--
branch : distribute
extra : rebase_source : e14172505ff8938f00f51de4f29a8fb2834ac933
Diffstat (limited to 'setuptools/command/upload.py')
| -rwxr-xr-x | setuptools/command/upload.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |