cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix pycrypto backend setting to work when multiple distros are specified in DEB_DIST

Browse source
This commit is contained in:
Graham Mainwaring 2017-07-12 17:28:56 -04:00 committed by Toshio Kuratomi
parent ed51380c2c
commit cde36b883c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/debian/control
View file

@ -3,7 +3,7 @@ Section: admin
Priority: optional Priority: optional
Standards-Version: 3.9.3 Standards-Version: 3.9.3
Maintainer: Ansible, Inc. <info@ansible.com> Maintainer: Ansible, Inc. <info@ansible.com>
Build-Depends: cdbs, debhelper (>= 5.0.0), asciidoc, python, dh-python | python-support, python-setuptools Build-Depends: cdbs, debhelper (>= 5.0.0), asciidoc, python, dh-python | python-support, python-setuptools, lsb-release
Homepage: http://ansible.github.com/ Homepage: http://ansible.github.com/
Package: ansible Package: ansible

2
packaging/debian/rules
View file

@ -6,7 +6,7 @@ DEB_PYTHON2_MODULE_PACKAGES=ansible
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/class/python-distutils.mk
ifeq ($(DEB_DIST), trusty) ifeq ($(shell lsb_release -cs), trusty)
export ANSIBLE_CRYPTO_BACKEND = pycrypto export ANSIBLE_CRYPTO_BACKEND = pycrypto
endif endif