[Python-checkins] distutils2: Fix merge error

tarek.ziade python-checkins at python.org
Sun Aug 8 11:50:47 CEST 2010


tarek.ziade pushed 7debb069fc21 to distutils2:

http://hg.python.org/distutils2/rev/7debb069fc21
changeset:   479:7debb069fc21
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Aug 05 18:23:21 2010 +0200
summary:     Fix merge error
files:       src/distutils2/tests/pypi_server.py

diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -330,7 +330,7 @@
             'licence': self.licence,
             'summary': self.summary,
             'home_page': self.homepage,
-            'stable_version': self.stale_version,
+            'stable_version': self.stable_version,
             'provides_dist': self.provides_dist,
             'requires': self.requires,
             'cheesecake_installability_id': self.cheesecake_installability_id,

--
Repository URL: http://hg.python.org/distutils2


More information about the Python-checkins mailing list