mtp

Merge lp://staging/~cyphermox/mtp/lp1421664 into lp://staging/mtp

lp1421664
Merge into trunk

Proposed by Mathieu Trudel-Lapierre on 2015-02-13

Status:

Merged

Approved by:

Sebastien Bacher on 2015-02-19

Approved revision:

Merged at revision:

Proposed branch:

lp://staging/~cyphermox/mtp/lp1421664

Merge into:

lp://staging/mtp

Diff against target:

27 lines (+4/-2)

2 files modified

debian/mtp-server.conf (+2/-1)
server/server.cpp (+2/-1)

To merge this branch:

bzr merge lp://staging/~cyphermox/mtp/lp1421664

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-02-13
Sebastien Bacher		2015-02-13	Approve on 2015-02-13
Ubuntu Phablet Team		2015-02-13	Pending
Review via email: mp+249669@code.staging.launchpad.net

Commit message

Fix startup issues on desktop: guard against android_usb not being available and don't fail with an abort when /dev/mtp_usb isn't there; just error and return.

Description of the change

Fix startup issues on desktop: guard against android_usb not being available and don't fail with an abort when /dev/mtp_usb isn't there; just error and return.

lp://staging/~cyphermox/mtp/lp1421664 updated on 2015-02-13

66. By Mathieu Trudel-Lapierre on 2015-02-13: We still need mtp to exit when it fails to open /dev/mtp_usb.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2015-02-13:

testing with sh it seems to be unhappy about the -o line, complaining about an illegal number, using that instead works
"if [ -z "$disconnected" ] || [ "$disconnected" -ge 1 ];"

not sure what's the issue with the version there (or with my local testing) though

Revision history for this message

Sebastien Bacher (seb128) wrote on 2015-02-13:

oh, I guess the reason is that the -o runs the second test even when the first one is invalid, or $disconnected is not a number in that case and that leads to the error

lp://staging/~cyphermox/mtp/lp1421664 updated on 2015-02-13