aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tring restore bitbucket pipeline. Fixing locale is wrong way. Try get error

Browse Source 
sting about copying.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-07-28 11:38:30 +03:00
parent 7b7ef6c0e2
commit e5cbf86ef2
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbucket-pipelines.yml
View File

@ -13,11 +13,7 @@ pipelines:
- grep -i processor /proc/cpuinfo | wc -l - grep -i processor /proc/cpuinfo | wc -l
- gcc --version - gcc --version
- apt-get update # required to install qt - apt-get update # required to install qt
- apt-get install -y locales xvfb qtbase5-dev libqt5svg5-dev qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf - apt-get install -y xvfb qtbase5-dev libqt5svg5-dev qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf
- locale
- echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
- locale-gen "en_US.UTF-8"
- update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
- mkdir build - mkdir build
- cd build - cd build
- qmake --version - qmake --version

6
src/test/ValentinaTest/abstracttest.cpp
View File

@ -176,9 +176,11 @@ bool AbstractTest::CopyRecursively(const QString &srcFilePath, const QString &tg
} }
} }
if (not QFile::copy(srcFilePath, tgtFilePath)) QFile srcFile(srcFilePath);
if (not srcFile.copy(tgtFilePath))
{ {
const QString msg = QString("Can't copy file '%1' to '%2'.").arg(srcFilePath).arg(tgtFilePath); const QString msg = QString("Can't copy file '%1' to '%2'. Error: %3").arg(srcFilePath).arg(tgtFilePath)
.arg(srcFile.errorString());
QWARN(qUtf8Printable(msg)); QWARN(qUtf8Printable(msg));
return false; return false;
} }