Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/autofix into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Problem autodetection/autofix feature to react on changes in the backend

Problem autodetection/autofix feature to react on changes in the backend

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/autofix]

481. By Benjamin Zeller on 2016-06-03

More descriptive error message.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:480
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/38/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3525/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/38/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:481
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/39/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3526/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/39/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/autofix]

482. By Benjamin Zeller on 2016-06-08

- Adapt to new click review format
- Wait longer for the target tool to return

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:482
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/41/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3614/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/41/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2016-06-08 14:59:03 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2016-06-08 14:59:03 +0000
@@ -363,59 +363,111 @@
 
 bool UbuntuPlugin::checkContainerSetup()
 {
-    QProcess proc;
-    proc.setProgram(Constants::UBUNTU_TARGET_TOOL);
-    proc.setArguments(QStringList{QStringLiteral("initialized")});
-    proc.start();
-    if (!proc.waitForFinished(3000)) {
-        criticalError(tr("The container backend setup detection failed.\nThe detection tool did not return in time.\nPlease try again."));
-    }
-    if (proc.exitStatus() != QProcess::NormalExit) {
-        criticalError(tr("The container backend setup detection failed.\nPlease try again."));
-    }
-
-    int exitCode = proc.exitCode();
-    if (exitCode == 255) {
-        //the tool tells us that we have no access to the LXD server
-        criticalError(tr("The current user can not access the LXD server which is required for the Ubuntu SDK.\nMake sure the user is part of the lxd group and restart the IDE."));
-    }
-
-    if(proc.exitCode() != 0 && Settings::askForContainerSetup()) {
-
-        QString text = tr("The container backend is not completely initialized.\n\n"
-                          "Create default configuration?\n"
-                          "Not setting up the container configuration will\nmake it impossible to run applications locally.\n\n"
-                          "Note: Will override existing LXD configurations."
-                          );
-
-        QMessageBox box(QMessageBox::Question, qApp->applicationName(),text, QMessageBox::Yes | QMessageBox::No | QMessageBox::Abort, Core::ICore::mainWindow());
-        QCheckBox *check = new QCheckBox(&box);
-        check->setText(tr("Do not show again"));
-        check->setChecked(false);
-        box.setCheckBox(check);
-
-        int choice = box.exec();
-        Settings::setAskForContainerSetup(check->checkState() != Qt::Checked);
-        Settings::flushSettings();
-
-        if (choice == QMessageBox::Yes) {
-            QString arguments = Utils::QtcProcess::joinArgs(QStringList{
-                Constants::UBUNTU_TARGET_TOOL,
-                QStringLiteral("autosetup"),
-                QStringLiteral("-y")
-            });
-
-            ProjectExplorer::ProcessParameters params;
-            params.setCommand(QLatin1String(Constants::UBUNTU_SUDO_BINARY));
-            params.setEnvironment(Utils::Environment::systemEnvironment());
-            params.setArguments(arguments);
-
-            int res = ProcessOutputDialog::runProcessModal(params, Core::ICore::mainWindow());
-            if (res != 0) {
-                criticalError(tr("Setting up the container backend failed."));
+    enum {
+        ERR_NONE         = 0,
+        ERR_NO_ACCESS    = 255,
+        ERR_NEEDS_FIXING = 254,
+        ERR_NO_BRIDGE    = 253
+        //ERR_UNKNOWN      = 200
+    };
+
+    bool ok = false;
+
+    while (!ok) {
+        QProcess proc;
+        proc.setProgram(Constants::UBUNTU_TARGET_TOOL);
+
+        QStringList args{QStringLiteral("initialized")};
+        if(!Settings::askForContainerSetup())
+            args.append(QStringLiteral("-b"));
+
+        proc.setArguments(args);
+        proc.start();
+        if (!proc.waitForFinished()) {
+            criticalError(tr("The container backend setup detection failed.\nThe detection tool did not return in time.\nPlease try again."));
+        }
+        if (proc.exitStatus() != QProcess::NormalExit) {
+            criticalError(tr("The container backend setup detection failed.\nPlease try again."));
+        }
+
+        switch(proc.exitCode()) {
+            case ERR_NONE:
+                ok = true;
+                break;
+            case ERR_NO_ACCESS:
+                    //the tool tells us that we have no access to the LXD server
+                    criticalError(tr("The current user can not access the LXD server which is required for the Ubuntu SDK.\n"
+                                     "Make sure the user is part of the lxd group and restart the IDE."));
+                break;
+            case ERR_NO_BRIDGE:
+                if (Settings::askForContainerSetup()) {
+                    QString text = tr("The container backend is not completely initialized.\n\n"
+                                      "Create default configuration?\n"
+                                      "Not setting up the container configuration will\nmake it impossible to run applications locally.\n\n"
+                                      "Note: Will override existing LXD configurations."
+                                      );
+
+                    QMessageBox box(QMessageBox::Question, qApp->applicationName(),text, QMessageBox::Yes | QMessageBox::No | QMessageBox::Abort, Core::ICore::mainWindow());
+                    QCheckBox *check = new QCheckBox(&box);
+                    check->setText(tr("Do not show again"));
+                    check->setChecked(false);
+                    box.setCheckBox(check);
+
+                    int choice = box.exec();
+                    Settings::setAskForContainerSetup(check->checkState() != Qt::Checked);
+                    Settings::flushSettings();
+
+                    if (choice == QMessageBox::Yes) {
+                        QString arguments = Utils::QtcProcess::joinArgs(QStringList{
+                            Constants::UBUNTU_TARGET_TOOL,
+                            QStringLiteral("autosetup"),
+                            QStringLiteral("-y")
+                        });
+
+                        ProjectExplorer::ProcessParameters params;
+                        params.setCommand(QLatin1String(Constants::UBUNTU_SUDO_BINARY));
+                        params.setEnvironment(Utils::Environment::systemEnvironment());
+                        params.setArguments(arguments);
+
+                        int res = ProcessOutputDialog::runProcessModal(params, Core::ICore::mainWindow());
+                        if (res != 0) {
+                            criticalError(tr("Setting up the container backend failed."));
+                        }
+                    } else if (choice == QMessageBox::Abort) {
+                        criticalError(tr("Container backend initialization was cancelled."));
+                    }
+                }
+                break;
+            case ERR_NEEDS_FIXING: {
+                QString text = tr("The container backend detection indicated problems.\n\n"
+                                  "Fix them automatically?\n"
+                                  );
+
+                QMessageBox box(QMessageBox::Question, qApp->applicationName(),text, QMessageBox::Yes | QMessageBox::Abort, Core::ICore::mainWindow());
+                int choice = box.exec();
+                if (choice == QMessageBox::Yes) {
+                    QString arguments = Utils::QtcProcess::joinArgs(QStringList{
+                        Constants::UBUNTU_TARGET_TOOL,
+                        QStringLiteral("autofix")
+                    });
+
+                    ProjectExplorer::ProcessParameters params;
+                    params.setCommand(QLatin1String(Constants::UBUNTU_SUDO_BINARY));
+                    params.setEnvironment(Utils::Environment::systemEnvironment());
+                    params.setArguments(arguments);
+
+                    int res = ProcessOutputDialog::runProcessModal(params, Core::ICore::mainWindow());
+                    if (res != 0) {
+                        criticalError(tr("Fixing the container backend failed."));
+                    }
+                } else if (choice == QMessageBox::Abort) {
+                    criticalError(tr("Automatic container backend fixing was cancelled."));
+                }
+                break;
             }
-        } else if (choice == QMessageBox::Abort) {
-            criticalError(tr("Container backend initialization was cancelled."));
+            default:
+                criticalError(tr("The container backend returned an unknown error status.\nThis is a bug and should never happen, please contact the developers."));
+                break;
         }
     }
     return true;

=== modified file 'src/ubuntu/ubuntuvalidationresultmodel.cpp'
--- src/ubuntu/ubuntuvalidationresultmodel.cpp	2015-11-24 11:14:08 +0000
+++ src/ubuntu/ubuntuvalidationresultmodel.cpp	2016-06-08 14:59:03 +0000
@@ -313,7 +313,7 @@
  */
 bool ClickRunChecksParser::tryParseNextSection(bool dataComplete)
 {
-    QRegularExpression re(QStringLiteral("^([=]+[\\s]+[A-Za-z0-9\\-_]+[\\s]+[=]+)$")); // match section beginnings
+    QRegularExpression re(QStringLiteral("^([=]+[\\s]+[\\S]+[\\s]+[=]+)$")); // match section beginnings
     re.setPatternOptions(QRegularExpression::MultilineOption);
 
     QRegularExpressionMatchIterator matchIter = re.globalMatch(m_data,m_nextSectionOffset);