Skip to content

Commit 0070029

Browse files
3nids3nids
authoredMay 1, 2017
Merge branch 'master' into sip-annotated
·
ltr-3_40final-3_0_0
2 parents bb1bded + 93971d5 commit 0070029

File tree

295 files changed

+6528
-4532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+6528
-4532
lines changed
 

‎.ci/travis/macos/script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)
3535

3636
rv=$?
3737

38-
if [ $? -eq 124 ] ; then
38+
if [ $rv -eq 124 ] ; then
3939
echo '\033[0;33mBuild and test timeout. Please restart the build for useful results.\033[0m'
4040
fi
4141

‎debian/python-qgis.install.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ usr/lib/python*/*-packages/qgis/gui/*
55
usr/lib/python*/*-packages/qgis/analysis/*
66
usr/lib/python*/*-packages/qgis/PyQt/*
77
usr/lib/python*/*-packages/qgis/testing/*
8-
usr/lib/python*/*-packages/pyspatialite/*
98
usr/lib/python*/*-packages/qgis/server/*

0 commit comments

Comments
 (0)
Please sign in to comment.