From 8e0d7fec6c0574a07758a62d79594928fb14442a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 31 Oct 2010 21:00:51 +0000 Subject: [PATCH] minor fixes related to revision ids --- iwjpictest/insn-aliases.inc-gen | 1 + layout/layout | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/iwjpictest/insn-aliases.inc-gen b/iwjpictest/insn-aliases.inc-gen index 9a3e290..67abc70 100755 --- a/iwjpictest/insn-aliases.inc-gen +++ b/iwjpictest/insn-aliases.inc-gen @@ -1,5 +1,6 @@ #!/bin/bash set -e +set -o pipefail badusage () { echo >&2 'bad usage'; exit 1; } diff --git a/layout/layout b/layout/layout index 16ad2e8..626993f 100755 --- a/layout/layout +++ b/layout/layout @@ -1672,14 +1672,15 @@ sub cmd_ident { my ($vs, @lt, $inf, $strft); $vs= "@al"; $vs= $1 if $vs =~ m/^\$Revision\: ([0-9.]+)\ \$$/; + $vs.= " " if length $vs; if (!defined $file_filename) { - $inf= "$vs (unknown file: $file_lineno)"; + $inf= "$vs(unknown file: $file_lineno)"; } elsif (!stat $file_filename || !(@lt= localtime((stat _)[9]))) { - $inf= "$file_filename ($1 $!)"; + $inf= "$file_filename ($vs$!)"; } else { $strft= strftime "%Y-%m-%d %H:%M:%S +%Z", @lt; - $inf= "$file_filename ($1 $strft)"; + $inf= "$file_filename ($vs$strft)"; } push @ident_strings, $inf; @al= (); -- 2.30.2