Comparar commits

...

3 Commits

Autor SHA1 Mensagem Data
Daniel Molkentin 57b65242e3 Make version check test conditional for now 2015-08-07 12:46:55 +02:00
Olivier Goffart a1a66f8eda Fixup ce5be89a18 2015-08-07 11:13:31 +02:00
Daniel Molkentin 866c21664b ownSql: Do not use sqlite3 method not present in older version
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 10:53:18 +02:00
3 arquivos alterados com 6 adições e 2 exclusões
+1 -1
Ver Arquivo
@@ -106,7 +106,7 @@ csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle) {
file_stat->name = c_utf8_from_locale(dirent->d_name);
if (file_stat->name == NULL) {
//file_stat->original_name = c_strdup(dirent->d_name);
if (asprintf(&file_stat->original_name, "%s/%s", handle->path, dirent->d_name)) {
if (asprintf(&file_stat->original_name, "%s/%s", handle->path, dirent->d_name) < 0) {
goto err;
}
CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Invalid characters in file/directory name, please rename: \"%s\" (%s)",
+1 -1
Ver Arquivo
@@ -137,7 +137,7 @@ void SqlDatabase::close()
if( _db ) {
SQLITE_DO(sqlite3_close(_db) );
if (_errId != SQLITE_OK) {
qWarning() << "ERROR When closing DB" << _error << sqlite3_db_filename(_db, 0);
qWarning() << "ERROR When closing DB" << _error;
}
_db = 0;
}
+4
Ver Arquivo
@@ -106,6 +106,10 @@ private slots:
void testVersionOfInstalledBinary()
{
if( isLinux() ) {
if ( qgetenv("DISPLAY").isEmpty() ) {
// Current requires an X-Server
return;
}
QString ver = versionOfInstalledBinary(OWNCLOUD_BIN);
qDebug() << "Version of installed ownCloud Binary: " << ver;
QVERIFY( !ver.isEmpty());