Merge lp:~ogra/phablet-tools/phablet-tools-fix-writable-image into lp:phablet-tools

[Oliver Grawert]

fix phablet-config to not require a reboot when already writable, fix ASKPASS handling, make output of phablet-config writable-image more verbose for ppa and package actions

fix phablet-config to not require a reboot when already writable, fix ASKPASS handling, make output of phablet-config writable-image more verbose for ppa and package actions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/385/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ogra/phablet-tools/phablet-tools-fix-writable-image]

311. By Oliver Grawert on 2014-09-17

fix pep8

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/386/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/67

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/386/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

cosmetic fixes

review: Needs Fixing

[lp:~ogra/phablet-tools/phablet-tools-fix-writable-image]

312. By Oliver Grawert on 2014-09-17

use single quotes in print() call

[Oliver Grawert (ogra)]

@sergio
the in-shell printf needs double quotes, else the "printf '$format' 'line1' 'line2'" notation will not work.
i fixed the other quoting.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/387/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/387/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

On miércoles 17 de septiembre de 2014 10h'13:23 ART, Oliver Grawert wrote:
> @sergio
> the in-shell printf needs double quotes, else the "printf
> '$format' 'line1' 'line2'" notation will not work.
> i fixed the other quoting.

you can aways escape those ;-) But ok

[Oliver Grawert (ogra)]

hi,
Am Mittwoch, den 17.09.2014, 10:35 -0300 schrieb Sergio Schvezov:
> On miércoles 17 de septiembre de 2014 10h'13:23 ART, Oliver Grawert wrote:
> > @sergio
> > the in-shell printf needs double quotes, else the "printf
> > '$format' 'line1' 'line2'" notation will not work.
> > i fixed the other quoting.
>
> you can aways escape those ;-) But ok
yes, at the cost of having to double escape the already existing double
escapes too ... in the end the line would be full of backslashes and
unreadable.

ciao
 oli

[Sergio Schvezov (sergiusens)]

lgtm

review: Approve

=== modified file 'phablet-config'
--- phablet-config	2014-09-16 10:05:01 +0000
+++ phablet-config	2014-09-17 13:07:57 +0000
@@ -109,8 +109,10 @@
         dbusarg = 'false'
         if args.dbus_probe == 'enable':
             dbusarg = 'true'
-        dbus_call = 'dbus-send --system --print-reply --dest=com.canonical.PropertyService ' \
-                    '/com/canonical/PropertyService com.canonical.PropertyService.SetProperty ' \
+        dbus_call = 'dbus-send --system --print-reply ' \
+                    '--dest=com.canonical.PropertyService ' \
+                    '/com/canonical/PropertyService ' \
+                    'com.canonical.PropertyService.SetProperty ' \
                     'string:autopilot boolean:%s' % dbusarg
         adb.shell(dbus_call, False)
         # wait until it is done; it takes a while to start apparmor_parser, so
@@ -126,23 +128,25 @@
 
 
 def sudo_shell(adb, sudocmd, cmd):
-    adb.shell('%s %s' % (sudocmd, cmd))
+    output = adb.shell('%s %s' % (sudocmd, cmd), ignore_errors=False)
+    print('%s' % output)
 
 
 def _handle_writable_image(adb, args):
-    if not is_remote_root(adb):
-        dbus_call = 'dbus-send --system --print-reply --dest=com.canonical.PropertyService ' \
-                    '/com/canonical/PropertyService com.canonical.PropertyService.SetProperty ' \
-                    'string:writable boolean:true'
-        adb.shell(dbus_call, False)
-        adb.reboot()
-    else:
-        fname = '/userdata/.writable_image'
-        try:
-            adb.shell('test -e %s' % fname, False)
-        except CalledProcessError as e:
+    fname = '/userdata/.writable_image'
+    try:
+        adb.shell('test -e %s' % fname, False)
+    except CalledProcessError as e:
+        if not is_remote_root(adb):
+            dbus_call = 'dbus-send --system --print-reply ' \
+                        '--dest=com.canonical.PropertyService ' \
+                        '/com/canonical/PropertyService ' \
+                        'com.canonical.PropertyService.SetProperty ' \
+                        'string:writable boolean:true'
+            adb.shell(dbus_call, False)
+        else:
             adb.shell('touch %s' % fname, False)
-            adb.reboot()
+        adb.reboot()
 
     adb.wait_for_device()
     adb.wait_for_network()
@@ -153,7 +157,7 @@
         if not is_remote_root(adb) and args.remotepassword:
             tempfile = adb.shell('mktemp -t sudo_askpass.XXXX').rstrip()
 
-            adb.shell('/bin/echo -e \\"#!/bin/sh\necho %s \\" > %s ' %
+            adb.shell("printf '%%s\\n' '#!/bin/sh' 'echo %s' >> %s " %
                       (args.remotepassword[0], tempfile), ignore_errors=False)
             adb.shell("chmod u+x %s" % tempfile)
             sudocmd = 'SUDO_ASKPASS=%s sudo -A' % tempfile