Merge lp:~smoser/pollinate/trunk.lp-1708461-safe-read-uptime into lp:~pollinate/pollinate/trunk

Proposed by Scott Moser on 2017-08-03
Status: Merged
Merged at revision: 340
Proposed branch: lp:~smoser/pollinate/trunk.lp-1708461-safe-read-uptime
Merge into: lp:~pollinate/pollinate/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
pollinate (+2/-2)
To merge this branch: bzr merge lp:~smoser/pollinate/trunk.lp-1708461-safe-read-uptime
Reviewer Review Type Date Requested Status
pollinate 2017-08-03 Pending
Review via email: mp+328522@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pollinate'
--- pollinate 2016-11-02 12:46:27 +0000
+++ pollinate 2017-08-03 14:33:51 +0000
@@ -98,8 +98,8 @@
98 local lsb=$(echo "${DISTRIB_DESCRIPTION}" | sed -e "s/ /\//g")98 local lsb=$(echo "${DISTRIB_DESCRIPTION}" | sed -e "s/ /\//g")
99 local platform="$(uname -o)/$(uname -r)/$(uname -m)"99 local platform="$(uname -o)/$(uname -r)/$(uname -m)"
100 local cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"100 local cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
101 local up idle101 local up="NA" idle="NA"
102 read up idle < /proc/uptime102 { read up idle < /proc/uptime ; } >/dev/null 2>&1 || :
103 local uptime="uptime/$up/$idle"103 local uptime="uptime/$up/$idle"
104 USER_AGENT="pollinate${TESTING}/${pollinate_ver} curl/${curl_ver} cloud-init/${cloud_init_ver} ${lsb} ${platform} ${cpu} ${uptime}"104 USER_AGENT="pollinate${TESTING}/${pollinate_ver} curl/${curl_ver} cloud-init/${cloud_init_ver} ${lsb} ${platform} ${cpu} ${uptime}"
105}105}

Subscribers

People subscribed via source and target branches

to all changes: