Merge lp:~rsalveti/unity-mir/removing_armhf_hardcoded_path_QtWebProcess into lp:unity-mir

[Ricardo Salveti]

Using str.contains to find out if the cmdline is from a QtWebProcess process

Using str.contains to find out if the cmdline is from a QtWebProcess process

And remove the hardcoded armhf library path (usr/lib/arm-linux-gnueabihf).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:198
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/153

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/290/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

works for me, x86 support I suppose

I've to ask you to fill out this checklist before I can top-approve:
https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, all good

 * Did CI run pass? If not, please explain why.
Was ok

review: Approve

[Ricardo Salveti (rsalveti)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.

No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Not affecting packaging.

[Ricardo Salveti (rsalveti)]

> works for me, x86 support I suppose

Yes, so I can drop another custom package from my x86 ppa :-)

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-03-11 14:51:12 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-03-12 03:12:50 +0000
@@ -537,7 +537,7 @@
         return;
     }
 
-    if (info->startsWith("maliit-server") || info->startsWith("/usr/lib/arm-linux-gnueabihf/qt5/libexec/QtWebProcess")
+    if (info->startsWith("maliit-server") || info->contains("qt5/libexec/QtWebProcess")
         || info->startsWith("/usr/bin/signon-ui")) {
         authorized = true;
         m_fenceNext = true;

=== modified file 'src/modules/Unity/Application/proc_info.cpp'
--- src/modules/Unity/Application/proc_info.cpp	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/proc_info.cpp	2014-03-12 03:12:50 +0000
@@ -41,6 +41,10 @@
     return m_command.startsWith(prefix);
 }
 
+bool ProcInfo::CommandLine::contains(char const* prefix) const {
+    return m_command.contains(prefix);
+}
+
 boost::optional<QString> ProcInfo::CommandLine::getParameter(const char* name) const {
     QString pattern = QRegularExpression::escape(name) + "(\\S+)";
     QRegularExpression regExp(pattern);

=== modified file 'src/modules/Unity/Application/proc_info.h'
--- src/modules/Unity/Application/proc_info.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/proc_info.h	2014-03-12 03:12:50 +0000
@@ -40,6 +40,7 @@
         QByteArray m_command;
 
         bool startsWith(const char* prefix) const;
+        bool contains(const char* prefix) const;
         boost::optional<QString> getParameter(const char* name) const;
         QStringList asStringList() const;
     };