Merge lp:~smoser/pollinate/trunk.speedups into lp:~pollinate/pollinate/trunk

[Scott Moser]

[Scott Moser (smoser)]

This does change the order of packages, and makes their order in the string not guaranteed.

=== modified file 'pollinate'
--- pollinate	2018-01-30 22:28:52 +0000
+++ pollinate	2018-02-08 22:29:35 +0000
@@ -17,6 +17,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -e
+set -f
 
 PKG="pollinate"
 TMPDIR=$(mktemp -d -t "${PKG}.XXXXXXXXXXXX")
@@ -142,26 +143,68 @@
 	_RET="virt/$ret"
 }
 
+read_package_versions() {
+	local pkgs="pollinate curl cloud-init" data="" p=""
+	data=$(dpkg-query \
+		-W --showformat='${Package}/${Version} ' $pkgs 2>/dev/null) || :
+	# fill in 'package/' for any package not installed.
+	for p in ${pkgs}; do
+		[ "${data#*$p/}" = "$data" ] && data="${data} $p/"
+	done
+	if [ -n "$TESTING" ]; then
+		p="pollinate"
+		data="${data%%$p/*}$p${TESTING}/${data#*$p/}"
+	fi
+	set -- $data
+	_RET="$*"
+}
+
+read_uname_info() {
+	# taken from cloud-init ds-identify.
+	# run uname, and parse output.
+	# uname is tricky to parse as it outputs always in a given order
+	# independent of option order. kernel-version is known to have spaces.
+	# 1   -s kernel-name
+	# 2   -n nodename
+	# 3   -r kernel-release
+	# 4.. -v kernel-version(whitespace)
+	# N-2 -m machine
+	# N-1 -o operating-system
+	local out="" krel="" machine="" os=""
+	out=$(uname -snrvmo) || { _RET=""; return; }
+	set -- $out
+	krel="$3"
+	shift 3
+	while [ $# -gt 2 ]; do
+		shift
+	done
+	machine=$1
+	os=$2
+	_RET="$os/$krel/$machine"
+	return 0
+}
+
 user_agent() {
 	# Construct a user agent, with useful debug information
 	# Very similar to Firefox and Chrome
-	local pollinate_ver="$(dpkg-query -W --showformat='${Version}' pollinate 2>/dev/null || true)"
-	local curl_ver="$(dpkg-query -W --showformat='${Version}' curl 2>/dev/null || true)"
-	local cloud_init_ver="$(dpkg-query -W --showformat='${Version}' cloud-init 2>/dev/null)"
+	
 	. /etc/lsb-release
-	local lsb=$(echo "${DISTRIB_DESCRIPTION}" | sed -e "s/ /\//g")
-	local platform="$(uname -o)/$(uname -r)/$(uname -m)"
-	local cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
-	local up="NA" idle="NA"
+
+	local pkg_info="" lsb="" platform="" cpu="" up="NA" idle="NA" uptime
+	read_package_versions && pkg_info="$_RET"
+	read_uname_info && platform="$_RET"
+
+	lsb=$(echo "${DISTRIB_DESCRIPTION}" | sed -e "s/ /\//g")
+	cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
 	{ read up idle < /proc/uptime ; } >/dev/null 2>&1 || :
-	local uptime="uptime/$up/$idle"
+	uptime="uptime/$up/$idle"
 
 	local addl_data="" build_info="" virt=""
 	read_build_info && build_info="${_RET}"
 	read_addl_info && addl_data="${_RET}"
 	read_virt && virt="${_RET}"
 
-	USER_AGENT="pollinate${TESTING}/${pollinate_ver} curl/${curl_ver} cloud-init/${cloud_init_ver} ${lsb} ${platform} ${cpu} ${uptime}${virt:+ ${virt}}${build_info:+ ${build_info}}${addl_data:+ ${addl_data}}"
+	USER_AGENT="${pkg_info} ${lsb} ${platform} ${cpu} ${uptime}${virt:+ ${virt}}${build_info:+ ${build_info}}${addl_data:+ ${addl_data}}"
 }
 
 exchange() {