diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-17 20:05:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-17 20:05:35 +0000 |
| commit | e5d8a785073a7dd65e891a810486d263c696e557 (patch) | |
| tree | 4cee6260af6536386db62d60f8e6f7d180b2e1cf | |
| parent | 6975d22a56ebcb2b48af2a198ed2276fb51f5d5d (diff) | |
| parent | d529e2b2a2462687035318f6ed38467434aec6e8 (diff) | |
| download | pbr-e5d8a785073a7dd65e891a810486d263c696e557.tar.gz | |
Merge "Fix pypy soabi tests"
| -rw-r--r-- | pbr/tests/test_packaging.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py index b84cc9a..ab8ba49 100644 --- a/pbr/tests/test_packaging.py +++ b/pbr/tests/test_packaging.py @@ -749,8 +749,11 @@ def get_soabi(): soabi = None try: soabi = sysconfig.get_config_var('SOABI') + arch = sysconfig.get_config_var('MULTIARCH') except IOError: pass + if soabi and arch and 'pypy' in sysconfig.get_scheme_names(): + soabi = '%s-%s' % (soabi, arch) if soabi is None and 'pypy' in sysconfig.get_scheme_names(): # NOTE(sigmavirus24): PyPy only added support for the SOABI config var # to sysconfig in 2015. That was well after 2.2.1 was published in the |