From fdd306711a54a4b3feda8a10bd0f5d7b27f12c2b Mon Sep 17 00:00:00 2001 From: Nicolas Iooss Date: Wed, 14 Feb 2018 16:51:49 +0100 Subject: [PATCH] Travis-CI: do not duplicate $DESTDIR in $PYSITEDIR Recent commits removed $DESTDIR from $PYSITEDIR in libselinux and libsemanage: -PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])') +PYSITEDIR ?= $(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])') As "site.getsitepackages()" does not work within virtualenvs, .travis.yml defines PYSITEDIR's value in it and this definition needs to be updated too. Signed-off-by: Nicolas Iooss --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88f6297e..0312e996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,7 +98,7 @@ before_script: - if echo "$PYVER" | grep -q pypy ; then export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include PYLIBS= ; fi # Python virtualenvs do not support "import site; print(site.getsitepackages()[0]" # cf. https://github.com/pypa/virtualenv/issues/355#issuecomment-10250452 - - export PYSITEDIR="$DESTDIR/usr/lib/$($PYTHON -c 'import sys;print("python%d.%d" % sys.version_info[:2])')/site-packages" + - export PYSITEDIR="/usr/lib/$($PYTHON -c 'import sys;print("python%d.%d" % sys.version_info[:2])')/site-packages" # Find the Ruby executable with version $RUBYLIBVER - export RUBY="$(ls -d -1 "$HOME/.rvm/rubies/ruby-$RUBYLIBVER"*/bin/ruby | head -n 1)" @@ -126,7 +126,7 @@ script: # Set up environment variables for the tests - export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib" - export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH" - - export PYTHONPATH="$PYSITEDIR" + - export PYTHONPATH="$DESTDIR$PYSITEDIR" - export RUBYLIB="$DESTDIR/$($RUBY -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$($RUBY -e 'puts RbConfig::CONFIG["vendorarchdir"]')" # Show variables (to help debugging issues)