minor fixes related to revision ids

diff --git a/iwjpictest/insn-aliases.inc-gen b/iwjpictest/insn-aliases.inc-gen
index 9a3e290e60a9f454c383a5d7196e506f8fbd722f..67abc706ef7482b5bae61247576d0265d78b835f 100755 (executable)
--- 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 16ad2e80bd1d541414e28e0824217071b473fae6..626993f45d133a23bf4d74dc8778097ad0973958 100755 (executable)
--- 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= ();