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

[Mathieu Trudel-Lapierre]

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.

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:~cyphermox/mtp/lp1421664]

66. By Mathieu Trudel-Lapierre on 2015-02-13

We still need mtp to exit when it fails to open /dev/mtp_usb.

[Sebastien Bacher (seb128)]

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

[Sebastien Bacher (seb128)]

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:~cyphermox/mtp/lp1421664]

67. By Mathieu Trudel-Lapierre on 2015-02-13

Improve on the if check for disconnected state.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/mtp-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/31/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

seems fine to me now, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/mtp-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/mtp-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/32/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2015-01-20 15:38:12 +0000
+++ debian/mtp-server.conf	2015-02-13 16:01:01 +0000
@@ -6,7 +6,8 @@
 pre-start script
     [ "$USER" != "lightdm" ] || { stop; exit 0; }
 
-    if grep -qc DISCONNECTED /sys/devices/virtual/android_usb/android0/state;
+    disconnected=`grep -c DISCONNECTED /sys/devices/virtual/android_usb/android0/state`;
+    if [ -z "$disconnected" ] || [ "$disconnected" -ge 1 ];
     then
         stop; exit 0;
     fi

=== modified file 'server/server.cpp'
--- server/server.cpp	2014-10-29 18:46:35 +0000
+++ server/server.cpp	2015-02-13 16:01:01 +0000
@@ -421,7 +421,8 @@
     int fd = open("/dev/mtp_usb", O_RDWR);
     if (fd < 0)
     {
-        LOG(FATAL) << "Error opening /dev/mtp_usb, aborting now...";
+        LOG(ERROR) << "Error opening /dev/mtp_usb, aborting now...";
+        return 1;
     }
  
     try {