mirror of
https://github.com/kennethreitz/heroku-buildpack-python.git
synced 2026-06-05 23:10:16 +00:00
remove broken pin from sqlite install
This commit is contained in:
+10
-29
@@ -3,21 +3,10 @@
|
||||
# shellcheck source=bin/utils
|
||||
source "$BIN_DIR/utils"
|
||||
|
||||
sqlite3_version() {
|
||||
if [ "$STACK" = "cedar-14" ]; then
|
||||
SQLITE3_VERSION="3.8.2-1ubuntu2.2"
|
||||
elif [ "$STACK" = "heroku-16" ]; then
|
||||
SQLITE3_VERSION="3.11.0-1ubuntu1.3"
|
||||
else
|
||||
SQLITE3_VERSION="3.22.0-1ubuntu0.2"
|
||||
fi
|
||||
|
||||
export SQLITE3_VERSION
|
||||
}
|
||||
sqlite3_version()
|
||||
|
||||
sqlite3_install() {
|
||||
HEROKU_PYTHON_DIR="$1"
|
||||
SQLITE3_VERSION="$2"
|
||||
HEADERS_ONLY="$3"
|
||||
|
||||
mkdir -p "$HEROKU_PYTHON_DIR"
|
||||
@@ -35,9 +24,9 @@ sqlite3_install() {
|
||||
|
||||
apt-get $APT_OPTIONS update > /dev/null 2>&1
|
||||
if [ -z "$HEADERS_ONLY" ]; then
|
||||
apt-get $APT_OPTIONS -y -d --reinstall install libsqlite3-dev="$SQLITE3_VERSION" sqlite3="$SQLITE3_VERSION" > /dev/null 2>&1
|
||||
apt-get $APT_OPTIONS -y -d --reinstall install libsqlite3-dev sqlite3 > /dev/null 2>&1
|
||||
else
|
||||
apt-get $APT_OPTIONS -y -d --reinstall install libsqlite3-dev="$SQLITE3_VERSION"
|
||||
apt-get $APT_OPTIONS -y -d --reinstall install libsqlite3-dev
|
||||
fi
|
||||
|
||||
find "$APT_CACHE_DIR/archives/" -name "*.deb" -exec dpkg -x {} "$HEROKU_PYTHON_DIR/sqlite3/" \;
|
||||
@@ -70,7 +59,6 @@ sqlite3_install() {
|
||||
}
|
||||
|
||||
buildpack_sqlite3_install() {
|
||||
sqlite3_version
|
||||
HEROKU_PYTHON_DIR="$BUILD_DIR/.heroku/python"
|
||||
|
||||
SQLITE3_VERSION_FILE="$BUILD_DIR/.heroku/python-sqlite3-version"
|
||||
@@ -80,21 +68,14 @@ buildpack_sqlite3_install() {
|
||||
|
||||
# python version check
|
||||
if python_sqlite3_check "$PYTHON_VERSION"; then
|
||||
# only install if the sqlite3 version has changed
|
||||
if [ "$INSTALLED_SQLITE3_VERSION" != "$SQLITE3_VERSION" ]; then
|
||||
puts-step "Installing SQLite3"
|
||||
puts-step "Installing SQLite3"
|
||||
|
||||
if sqlite3_install "$BUILD_DIR/.heroku/python" "$SQLITE3_VERSION" ; then
|
||||
echo "Sqlite3 successfully installed."
|
||||
mcount "success.python.sqlite3"
|
||||
else
|
||||
echo "Sqlite3 failed to install."
|
||||
mcount "failure.python.sqlite3"
|
||||
fi
|
||||
|
||||
# save version installed
|
||||
mkdir -p "$CACHE_DIR/.heroku/"
|
||||
echo "$SQLITE3_VERSION" > "$CACHE_DIR/.heroku/python-sqlite3-version"
|
||||
if sqlite3_install "$BUILD_DIR/.heroku/python" ; then
|
||||
echo "Sqlite3 successfully installed."
|
||||
mcount "success.python.sqlite3"
|
||||
else
|
||||
echo "Sqlite3 failed to install."
|
||||
mcount "failure.python.sqlite3"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user