diff options
| author | Graham Mainwaring <gmainwar@redhat.com> | 2017-07-12 17:28:56 -0400 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-07-13 12:13:54 -0700 |
| commit | cde36b883c044ae099804a3975296623d7350d6d (patch) | |
| tree | 8d9681684a152988fd6a62c7ba6f65b846296179 /packaging | |
| parent | ed51380c2c34a6a979b6cde45e6e819d6ed541cd (diff) | |
| download | ansible-cde36b883c044ae099804a3975296623d7350d6d.tar.gz | |
Fix pycrypto backend setting to work when multiple distros are specified in DEB_DIST
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/debian/control | 2 | ||||
| -rwxr-xr-x | packaging/debian/rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/debian/control b/packaging/debian/control index 2db9db468f..8e5c6a7877 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Standards-Version: 3.9.3 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/ Package: ansible diff --git a/packaging/debian/rules b/packaging/debian/rules index b48c433c33..130451a1ea 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -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 |