Merge lp:~mvo/qtcreator-plugin-ubuntu/lp1360582 into lp:qtcreator-plugin-ubuntu

[Michael Vogt]

Run pkcon with --allow-untrusted (LP: #1360582).

This add --allow-untrusted to the pkcon command. There is a also a addtional commit with a drive-by cleanup. Please test as I couldn't find how to run the testsuite (its not described in the README).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/401/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/169

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/401/rebuild

review: Approve (continuous-integration)

[Michael Vogt (mvo)]

This needs to land together with lp:~mvo/click/lp1360582-honor-enum-only-trusted

[Zoltan Balogh (bzoltan)]

The new feature of deploying Scopes on the device required some refactoring of the qtc_device_applaunch.py script ->

https://code.launchpad.net/~zeller-benjamin/qtcreator-plugin-ubuntu/scoperemoterun/+merge/233067

Please check for possible merge conflicts.

review: Needs Fixing

[lp:~mvo/qtcreator-plugin-ubuntu/lp1360582]

251. By Michael Vogt on 2014-09-04

merged trunk and resolved conflicts

[Michael Vogt (mvo)]

I resolved the conflicts now, please re-review.

Fwiw, not having this is blocking signed click packages. So pushing a conflicting branch ahead of this one even though this branch is a) ready since a couple of days b) trivial c) unblocks a important feature is really not ideal IMO.

Colin pointed out that this can land independent of lp:~mvo/click/lp1360582-honor-enum-only-trusted because click will right run with "--allow-untrusted" all the time, so having this land first is fine (just the other way around is not possible).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/178

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/410/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Zoltan Balogh (bzoltan)]

review: Needs Fixing

[Zoltan Balogh (bzoltan)]

Do we need packagekit-tools dependency for the qtcreator-plugin-ubuntu? The qtc_device_applaunch is only executed on the phone.

Also the version you need does not exist on LTS. So the packagekit-tools (>= 0.8.17-4ubuntu2) would break the SDK on Trusty where the packagekit-tools is on 0.8.12.

[lp:~mvo/qtcreator-plugin-ubuntu/lp1360582]

252. By Michael Vogt on 2014-09-05

debian/control: remove packagekit-tools dependency again as this is only needed on the phone, not the SDK itself (thanks to bzoltan)

[Michael Vogt (mvo)]

Thanks Zoltan! I fixed this now and pushed a new version.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/179

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/411/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[lp:~mvo/qtcreator-plugin-ubuntu/lp1360582]

253. By Michael Vogt on 2014-09-08

share/qtcreator/ubuntu/scripts/qtc_project_click_deploy: add missing "--allow-untrusted"

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py'
--- share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2014-09-02 14:35:13 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py	2014-09-08 09:39:04 +0000
@@ -350,7 +350,8 @@
 #we have all informations, now install the click package
 #@TODO check if its already installed
 
-success = subprocess.call(["pkcon","install-local",options.clickPck,"-p"])
+success = subprocess.call(
+    ["pkcon","--allow-untrusted","install-local",options.clickPck,"-p"])
 if success != 0:
     print("Installing the application failed",flush=True)
     sys.exit(1)
 
=== modified file 'share/qtcreator/ubuntu/scripts/qtc_project_click_deploy'
--- share/qtcreator/ubuntu/scripts/qtc_project_click_deploy	2014-05-21 09:13:18 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_project_click_deploy	2014-09-08 09:39:04 +0000
@@ -80,5 +80,5 @@
 do
  echo "Installing $FILE to device.."
  # note adb shell and adb_shell are two different things, adb_shell comes from functions.inc
- adb_shell sudo -H -u ${TARGET_DEVICE_USERNAME} pkcon install-local ${TARGET_DEVICE_HOME}/${FILE}
+ adb_shell sudo -H -u ${TARGET_DEVICE_USERNAME} pkcon install-local --allow-untrusted ${TARGET_DEVICE_HOME}/${FILE}
 done