Merge lp:~zeller-benjamin/ubuntu-sdk-ide/no-superuser into lp:ubuntu-sdk-ide

[Benjamin Zeller]

- Less warnings when opening a snapcraft project
- Do not allow superuser to open the IDE

- Less warnings when opening a snapcraft project
- Do not allow superuser to open the IDE

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

PASSED: Continuous integration, rev:169
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/365/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7220/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:169
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/366/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7221/console

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftprojectnode.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftprojectnode.cpp	2016-11-07 11:19:36 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftprojectnode.cpp	2016-11-14 16:00:48 +0000
@@ -420,7 +420,9 @@
         watches << currentPath.toFileInfo().absoluteFilePath();
     }
 
-    m_watcher->addPaths(watches);
+    if (!watches.isEmpty())
+        m_watcher->addPaths(watches);
+
     return currFolder;
 }
 
 
=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuplugin.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuplugin.cpp	2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuplugin.cpp	2016-11-14 16:00:48 +0000
@@ -91,6 +91,8 @@
 
 #include <coreplugin/icore.h>
 #include <stdint.h>
+#include <unistd.h>
+#include <sys/types.h>
 
 
 using namespace Ubuntu;
@@ -123,6 +125,11 @@
     defaultFont.setFamily(QStringLiteral("Ubuntu"));
     defaultFont.setWeight(QFont::Light);
 
+
+    if (::getuid() == 0) {
+        criticalError(tr("\nThe Ubuntu SDK can not be used as superuser."));
+        return false;
+    }
     if (QStandardPaths::findExecutable(QStringLiteral("lxc")).isEmpty()) {
         criticalError(tr("\nLxd is not installed properly.\nIt is required for the Ubuntu-SDK-IDE to work."));
         return false;
@@ -419,7 +426,7 @@
             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."));
+                                     "Make sure the user is part of the lxd group, relogin and restart the IDE."));
                 break;
             case ERR_NO_BRIDGE:
                 if (Settings::askForContainerSetup()) {