Skip to content

Commit

Permalink
Fix pycrypto backend setting to work when multiple distros are specif…
Browse files Browse the repository at this point in the history
…ied in DEB_DIST
  • Loading branch information
ghjm authored and abadger committed Jul 13, 2017
1 parent ed51380 commit cde36b8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: admin
Priority: optional
Standards-Version: 3.9.3
Maintainer: Ansible, Inc. <[email protected]>
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/

Package: ansible
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DEB_PYTHON2_MODULE_PACKAGES=ansible
include /usr/share/cdbs/1/rules/debhelper.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
endif

0 comments on commit cde36b8

Please sign in to comment.