← Back to branch summary

~uonedb-qt/u1db-qt/rtm

« back to all changes in this revision

Viewing changes to src/database.cpp

  • Committer: CI bot
  • Author(s): Christian Dywan
  • Date: 2014-11-11 15:27:33 UTC
  • mfrom: (119.1.3 u1db.trunks)
  • Revision ID: ps-jenkins@lists.canonical.com-20141111152733-ngdd8w1ludq1225u
Create parent folder for full database path Fixes: 1390166
Approved by: PS Jenkins bot, Michał Karnicki

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/database.cpp
145
145
        QString absolutePath(QDir(dataPath).absoluteFilePath(path));
146
146
        QString parent(QFileInfo(absolutePath).dir().path());
147
147
        if (!QDir().mkpath(parent))
148
 
            qWarning() << "Failed to make data folder" << parent;
 
148
            setError(QString("Failed to make data folder %1").arg(parent));
149
149
        m_db.setDatabaseName(absolutePath);
150
150
    }
151
151
    else
152
 
    m_db.setDatabaseName(path);
 
152
    {
 
153
        QDir parent(QFileInfo(path).dir());
 
154
        if (!parent.mkpath(parent.path()))
 
155
            setError(QString("Failed to make parent folder %1").arg(parent.path()));
 
156
        m_db.setDatabaseName(path);
 
157
    }
153
158
 
154
159
    if (!m_db.open())
155
160
        return setError(QString("Failed to open %1: %2").arg(path).arg(m_db.lastError().text()));