bugfix!

Merge branch 'master' into pylibmc
debug
2026-06-05 23:10:16 +00:00 · 2014-08-01 16:49:08 -04:00 · 2014-08-01 16:40:39 -04:00 · 2014-08-01 16:05:57 -04:00 · 2014-08-01 16:03:45 -04:00 · 2014-08-01 16:02:32 -04:00
1 changed files with 5 additions and 9 deletions
@@ -10,7 +10,7 @@
 # This script is invoked by [`bin/compile`](/).
 # The location of the pre-compiled libmemcached binary.
-VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz"
+VENDORED_MEMCACHED="http://lang-python.s3.amazonaws.com/$STACK/libraries/vendor/libmemcache.tar.gz"
 # Syntax sugar.
 source $BIN_DIR/utils
@@ -19,21 +19,17 @@ bpwatch start pylibmc_install
 # If pylibmc exists within requirements, use vendored libmemcached.
 if (pip-grep -s requirements.txt pylibmc) then
  echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
  cd .heroku
  if [ -d "vendor/lib/sasl2" ]; then
    export LIBMEMCACHED=$(pwd)/vendor
  else
    echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
    mkdir -p .heroku/vendor
    # Download and extract libmemcached into target vendor directory.
-    curl -s -L -o tmp-libmemcached.tar.gz $VENDORED_MEMCACHED
+    curl $VENDORED_MEMCACHED -s | tar zxv -C .heroku/vendor &> /dev/null
-    tar -zxvf tmp-libmemcached.tar.gz > /dev/null
+
    rm tmp-libmemcached.tar.gz
    export LIBMEMCACHED=$(pwd)/vendor
  fi
  export LIBMEMCACHED=$(pwd)/vendor
  cd ..
 fi
 bpwatch stop pylibmc_install
Author	SHA1	Message	Date
Kenneth Reitz	8740fcdbad	bugfix!	2014-08-01 16:49:08 -04:00
Kenneth Reitz	fb18948243	Merge branch 'master' into pylibmc	2014-08-01 16:40:39 -04:00
Kenneth Reitz	fa8e09ae9c	debug	2014-08-01 16:05:57 -04:00
Kenneth Reitz	2dd212d020	silence untar	2014-08-01 16:03:45 -04:00
Kenneth Reitz	15acd305d1	mkdir -p	2014-08-01 16:02:32 -04:00
Kenneth Reitz	5a65a39c5e	sub-env, not source	2014-08-01 15:57:24 -04:00
Kenneth Reitz	f18754f8f0	pylibmc attempt	2014-08-01 15:46:14 -04:00