Merge lp:~ogra/phablet-tools/fix-socket-location into lp:phablet-tools

[Oliver Grawert]

phablet-screenshot: mirscreencast needs the socket location handed over now that the Mir socket moved to /run/mir_socket (LP: #1327139).

Mir socket location changed, adjust phablet-screenhot for this

[lp:~ogra/phablet-tools/fix-socket-location]

282. By Oliver Grawert on 2014-06-07

fix Mir socket location in phablet-screenshot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:282
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ogra/phablet-tools/fix-socket-location/+merge/222422/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/22

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

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Works fine, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-28 13:03:42 +0000
+++ debian/changelog	2014-06-07 08:31:49 +0000
@@ -1,3 +1,10 @@
+phablet-tools (1.0+14.10.20140528.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * phablet-screenshot: mirscreencast needs the socket location handed over now
+    that the Mir socket moved to /run/mir_socket (LP: #1327139).
+
+ -- Oliver Grawert <[e-mail]>  Sat, 07 Jun 2014 10:16:06 +0200
+
 phablet-tools (1.0+14.10.20140528.1-0ubuntu1) utopic; urgency=low
 
   [ Robert Bruce Park ]

=== modified file 'phablet-screenshot'
--- phablet-screenshot	2014-05-14 13:05:18 +0000
+++ phablet-screenshot	2014-06-07 08:31:49 +0000
@@ -111,8 +111,13 @@
     CONVERTOPTS="$CONVERTOPTS -depth $depth -size $size"
     MIRFILENAME="/tmp/mir_screencast_$size.$sfx"
 
+    # for backwards compatibility we check for socket existence and fall
+    # back to the old location if the new socket does not exist
+    SOCKET=$(adb shell "ls /run/mir_socket 2>/dev/null | tr -d '\n'")
+    [ -z "$SOCKET" ] && SOCKET="/tmp/mir_socket"
+
     echo "I: Dumping $FBDEV ..."
-    adb shell mirscreencast -m /tmp/mir_socket -n1 -f $MIRFILENAME
+    adb shell mirscreencast -m $SOCKET -n1 -f $MIRFILENAME
     adb pull $MIRFILENAME ${PICDIR}/fb
 
     [ ! -e "${PICDIR}/fb" ] && echo "E: Capture failed!" && return