From 53dc59511391a8a7d4cf2f9a3ce0b0fb8adc31df Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 19 Jun 2009 13:05:44 +0200
Subject: [PATCH] b3, fix (likelY) windows-path-comparison related issue at
 plugin registration link to PyPI

--HG--
branch : trunk
---
 CHANGELOG                | 2 +-
 MANIFEST                 | 1 +
 doc/download.txt         | 4 +++-
 doc/index.txt            | 4 +++-
 py/__init__.py           | 2 +-
 py/test/pluginmanager.py | 3 ++-
 setup.py                 | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7e5219c08..da78f2fc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 $Id: CHANGELOG 65819 2009-06-18 18:09:57Z hpk $
 
-Changes between 1.0.0b1 and 1.0.0b2
+Changes between 1.0.0b1 and 1.0.0b3
 =============================================
 
 * plugin classes are removed: one now defines 
diff --git a/MANIFEST b/MANIFEST
index 9d2113b5b..fd52490e9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -57,6 +57,7 @@ example/genxml.py
 example/pytest/failure_demo.py
 example/pytest/test_failures.py
 example/pytest/test_setup_flow_example.py
+ez_setup.py
 py/LICENSE
 py/__init__.py
 py/_com.py
diff --git a/doc/download.txt b/doc/download.txt
index e17fa0b8f..170b2e1b5 100644
--- a/doc/download.txt
+++ b/doc/download.txt
@@ -2,7 +2,9 @@
 Downloading
 ==============
 
-Latest Release: 1.0.0b2
+.. _`PyPI project page`: http://pypi.python.org/pypi?%3Aaction=pkg_edit&name=py
+
+Latest Release, see `PyPI project page`_
 
 "easy_install py"
 ===================================================
diff --git a/doc/index.txt b/doc/index.txt
index 9d4fee142..2f5f0e858 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -1,7 +1,9 @@
 py lib: Main tools and APIs
 ===================================
 
-Latest Release: 1.0.0b2
+.. _`PyPI project page`: http://pypi.python.org/pypi?%3Aaction=pkg_edit&name=py
+
+Latest Release, see `PyPI project page`_
 
 `py.test`_ write and deploy unit- and functional tests to multiple machines. 
 
diff --git a/py/__init__.py b/py/__init__.py
index cb7475e98..2188708ed 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -19,7 +19,7 @@ For questions please check out http://pylib.org/contact.html
 """
 from initpkg import initpkg
 
-version = "1.0.0b2"
+version = "1.0.0b3"
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 
diff --git a/py/test/pluginmanager.py b/py/test/pluginmanager.py
index 5d1ed4954..d0c55cbe0 100644
--- a/py/test/pluginmanager.py
+++ b/py/test/pluginmanager.py
@@ -33,7 +33,8 @@ class PluginManager(object):
     def register(self, plugin, name=None):
         assert not self.isregistered(plugin)
         name = self._getpluginname(plugin, name)
-        assert name not in self.impname2plugin
+        if name in self.impname2plugin:
+            return False
         self.impname2plugin[name] = plugin
         self.hook.pytest_plugin_registered(plugin=plugin)
         self._checkplugin(plugin)
diff --git a/setup.py b/setup.py
index ba7bd2b24..17a9fa877 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def main():
         name='py',
         description='py.test and pylib: advanced testing tool and networking lib',
         long_description = long_description, 
-        version='1.0.0b2', 
+        version='1.0.0b3', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],