From 0fd8716579367fceb2b8f98af3a59d1868da48be Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 29 Dec 2011 12:27:25 -0600 Subject: [PATCH] * usr/lib/byobu/cpu_freq, usr/lib/byobu/include/shutil: LP: #909325 - use a leading zero on fpdiv operations, for consistency with awk-based math --- debian/changelog | 3 +++ usr/lib/byobu/cpu_freq | 4 ++-- usr/lib/byobu/include/shutil | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e4b9c56..ac4ed60f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ byobu (5.1) unreleased; urgency=low - switch the order of the listed backends * debian/control: LP: #909221 - depend on tmux, recommend screen + * usr/lib/byobu/cpu_freq, usr/lib/byobu/include/shutil: LP: #909325 + - use a leading zero on fpdiv operations, for consistency with + awk-based math -- Dustin Kirkland Sat, 24 Dec 2011 17:35:04 -0600 diff --git a/usr/lib/byobu/cpu_freq b/usr/lib/byobu/cpu_freq index 866a0050..bc71d4ff 100755 --- a/usr/lib/byobu/cpu_freq +++ b/usr/lib/byobu/cpu_freq @@ -31,12 +31,12 @@ __cpu_freq() { freq="$_RET" else if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then - freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }') + freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }') else # Must scale frequency by number of processors, if counting bogomips count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo) freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }') - freq=$(echo "$freq" "$count" | awk '{printf "%.1f\n", $1/$2/1000}') + freq=$(echo "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}') fi fi color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "$ICON_GHz"; color -- diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 61d59ef1..3c82bcd6 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -180,7 +180,7 @@ fpdiv() { n=${n%?} whole=${n%${chunk}} part=${n#${whole}} - _RET=${whole}${part:+.${part}} + _RET=${whole:-0}${part:+.${part}} return }