Merge lp:~ogra/phablet-tools/no-sudo-in-phablet-network into lp:phablet-tools

[Oliver Grawert]

we do not need sudo if we can read the network credentials file we hand over via commandline option to phablet-network, so lets not require it.

do not require sudo for network credential files we can read

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/304/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/76

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Tested with a file owned by my uid and with ones that can't be read by me (root owned and 500)

review: Approve

=== modified file 'phablet-network'
--- phablet-network	2013-10-03 15:12:23 +0000
+++ phablet-network	2014-04-09 11:21:37 +0000
@@ -114,7 +114,9 @@
     echo Network file is $network_file
 
     TMP_FILE=$(mktemp)
-    sudo grep -v mac-address "$network_file" > $TMP_FILE
+    CMD="grep -v mac-address"
+    [ ! -r "$network_file" ] && CMD="sudo $CMD"
+    $CMD "$network_file" > $TMP_FILE
 
     echo Provisioning network file to device
     target_network_file=$NETWORK_MANAGER/active_ws_connection.conf