diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2016-10-07 01:25:05 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2016-10-07 15:33:02 +0300 |
| commit | 62d1cfe16c2aa7ab3c9925762b016c891672eefc (patch) | |
| tree | c3c2770da3e7416881561cd98c6c109170f55fab | |
| parent | 1369696b8a194c8dbaf8d92a8b1f46309740d1f9 (diff) | |
| download | mariadb-git-62d1cfe16c2aa7ab3c9925762b016c891672eefc.tar.gz | |
Deb: always build mariadb-cracklib-password-check, even on Travis-CI
Previously Travis-CI stated that cracklib is forbidden, but it does
not longer seem to be the case.
| -rwxr-xr-x | debian/autobake-deb.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 60ba21fa279..5259a4fe152 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -40,8 +40,7 @@ CODENAME="$(lsb_release -sc)" # Add libcrack2 (>= 2.9.0) as a build dependency if available in the distribution # This matches Debian Jessie, Stretch and Ubuntu Trusty, Wily, Xenial, Yakkety # Update check when version 2.10 or newer is available. -# On Travis-CI never build cracklib, as it is forbidden on Travis-CI.org -if [[ ! $TRAVIS ]] && apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 +if apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 then sed 's/Standards-Version/,libcrack2-dev (>= 2.9.0)\nStandards-Version/' debian/control cat <<EOT >> debian/control |