avoid pbr's non multi-version aware script

otherwise the latest ryu-manager can pick up older modules
if multiple versions of ryu is installed on a system.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-10-07 14:43:52 +09:00 committed by FUJITA Tomonori
parent 9159bd74fe
commit d6a9890b08
2 changed files with 31 additions and 0 deletions

View File

@ -16,9 +16,25 @@
# under the License. # under the License.
import sys import sys
from setuptools.command import easy_install
from ryu import version from ryu import version
# Global variables in this module doesn't work as we expect
# because, during the setup procedure, this module seems to be
# copied (as a file) and can be loaded multiple times.
# We save them into __main__ module instead.
def _main_module():
return sys.modules['__main__']
def save_orig():
"""Save original easy_install.get_script_args.
This is necessary because pbr's setup_hook is sometimes called
before ours."""
_main_module()._orig_get_script_args = easy_install.get_script_args
def setup_hook(config): def setup_hook(config):
"""Filter config parsed from a setup.cfg to inject our defaults.""" """Filter config parsed from a setup.cfg to inject our defaults."""
metadata = config['metadata'] metadata = config['metadata']
@ -31,3 +47,16 @@ def setup_hook(config):
config['metadata'] = metadata config['metadata'] = metadata
metadata['version'] = str(version) metadata['version'] = str(version)
# pbr's setup_hook replaces easy_install.get_script_args with
# their own version, override_get_script_args, prefering simpler
# scripts which are not aware of multi-version.
# prevent that by doing the opposite. it's a horrible hack
# but we are in patching wars already...
from pbr import packaging
def my_get_script_args(*args, **kwargs):
return _main_module()._orig_get_script_args(*args, **kwargs)
packaging.override_get_script_args = my_get_script_args
easy_install.get_script_args = my_get_script_args

View File

@ -21,8 +21,10 @@ except ImportError:
pass pass
import setuptools import setuptools
import ryu.hooks
ryu.hooks.save_orig()
setuptools.setup(name='ryu', setuptools.setup(name='ryu',
setup_requires=['pbr'], setup_requires=['pbr'],
pbr=True) pbr=True)