board-status: deal with sanitized paths

Change I9dd8e4027be21363015cd8df9918610e206afce2 replaces
colons with underscores in paths, to improve compatibility of paths.
This breaks any attempt to interpret the timestamp part of the tree
as a timestamp, so revert the change before doing so.

Change-Id: I0e82e4045120700e9b4fcc8c6e54d761068eaea3
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: https://review.coreboot.org/13766
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2016-02-22 03:01:57 +01:00 committed by Patrick Georgi
parent f0d39c409b
commit a05d033226
2 changed files with 6 additions and 5 deletions

View File

@ -19,7 +19,7 @@ quarterly() {
curr="" curr=""
sort -r -k4 -t/ | while read file; do sort -r -k4 -t/ | while read file; do
timestamp=`printf $file | cut -d/ -f4` timestamp=`printf $file | cut -d/ -f4 | tr _ :`
new=`$1 $timestamp` new=`$1 $timestamp`
if [ "$new" != "$curr" ]; then if [ "$new" != "$curr" ]; then
if [ "$curr" != "" ]; then if [ "$curr" != "" ]; then

View File

@ -17,9 +17,10 @@ while read line; do
for i in $rest; do for i in $rest; do
vendor_board=`echo $i | cut -d/ -f1-2` vendor_board=`echo $i | cut -d/ -f1-2`
commit=`echo $i | cut -d/ -f3` commit=`echo $i | cut -d/ -f3`
datetime=`echo $i | cut -d/ -f4` datetime_path=`echo $i | cut -d/ -f4`
datetime=`echo $datetime_path | tr _ :`
datetime_human=`LC_ALL=C TZ=UTC date --date="$datetime"` datetime_human=`LC_ALL=C TZ=UTC date --date="$datetime"`
upstream=`grep "^Upstream revision:" $vendor_board/$commit/$datetime/revision.txt |cut -d: -f2-` upstream=`grep "^Upstream revision:" $vendor_board/$commit/$datetime_path/revision.txt |cut -d: -f2-`
upstream=`git log -1 --format=%H $upstream` upstream=`git log -1 --format=%H $upstream`
if ! echo "$have"| grep "^$vendor_board:" > /dev/null; then if ! echo "$have"| grep "^$vendor_board:" > /dev/null; then
detailed="$detailed<span id=\"$vendor_board\"></span>$nl" detailed="$detailed<span id=\"$vendor_board\"></span>$nl"
@ -28,8 +29,8 @@ while read line; do
detailed="$detailed[[Board:$vendor_board|$vendor_board]] at $datetime_human$nl" detailed="$detailed[[Board:$vendor_board|$vendor_board]] at $datetime_human$nl"
detailed="$detailed[$CODE_GITWEB$upstream upstream tree] ($nl" detailed="$detailed[$CODE_GITWEB$upstream upstream tree] ($nl"
for file in "$vendor_board/$commit/$datetime/"*; do for file in "$vendor_board/$commit/$datetime_path/"*; do
if [ "$file" = "$vendor_board/$commit/$datetime/revision.txt" ]; then if [ "$file" = "$vendor_board/$commit/$datetime_path/revision.txt" ]; then
continue continue
fi fi
detailed="$detailed[$STATUS_GITWEB$file `basename $file`] $nl" detailed="$detailed[$STATUS_GITWEB$file `basename $file`] $nl"