Merge lp:~chris.gagnon/phablet-tools/fix_1289525 into lp:phablet-tools

[Chris Gagnon]

phablet-network: make it work in latest trusty

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

How about not using the find_active_network_again and replacing the original network_file= with
sudo grep -H "$network_active_uuid" /etc/NetworkManager/system-connections/* | grep uuid | cut -f1 -d:

That should return the file that has that uuid; seems less error prone as well.

I'm adding Andy so he can review as well against ci.

There also seems to be some tabbing going on in your changes.

Additionally, the original can be improve if
if [ -z "$network_active_uuid" ]

is done before finding out which network file holds the conf for the uuid.

review: Needs Fixing

[lp:~chris.gagnon/phablet-tools/fix_1289525]

243. By Chris Gagnon on 2014-03-10

add changes from code review

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

7 wireless_adapter="$(nmcli -t -f device,type dev | egrep wireless | cut -d: -f1)"
11 + if [ -z "$wireless_Adapter" ]

s/_Adapter/_adapter/

review: Needs Fixing

[Andy Doan (doanac)]

CI alway passes a specific file to this command, so we shouldn't touching the code-paths changed here.

[lp:~chris.gagnon/phablet-tools/fix_1289525]

244. By Chris Gagnon on 2014-03-10

fix capitalization

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

Works fine on latest trusty; need someone to check on precise.

review: Approve

[Chris Gagnon (chris.gagnon)]

I was able to check in precise, it worked fine in a live usb session after installing adb

=== modified file 'phablet-network'
--- phablet-network	2013-10-03 15:12:23 +0000
+++ phablet-network	2014-03-10 04:51:54 +0000
@@ -87,14 +87,19 @@
 
 find_active_network() {
     wireless_adapter="$(nmcli -t -f device,type dev | egrep wireless | cut -d: -f1)"
-    network_active_uuid="$(nmcli -t -f name,uuid,devices,vpn con status | grep $wireless_adapter | egrep ':no$'| cut -d: -f2)"
-    network_file=$(sudo grep "$network_active_uuid" $NETWORK_MANAGER/* | grep uuid | cut -d: -f1)
-
+    if [ -z "$wireless_adapter" ]
+    then
+        echo "No wireless adapter found, exiting"
+        exit 1
+    fi
+   network_active_uuid="$(nmcli -t -f name,uuid,devices,vpn con status | grep $wireless_adapter | egrep ':no$'| cut -d: -f2)"
     if [ -z "$network_active_uuid" ]
     then
         echo "No active wifi network connection, exiting"
         exit 1
     fi
+    network_file=$(sudo grep -H "$network_active_uuid" /etc/NetworkManager/system-connections/* | grep uuid | cut -f1 -d:)
+
     echo "$network_file"
 }