From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 8 May 2020 11:29:24 +0000 (+0100)
Subject: Merge branch '1.3.x'
X-Git-Tag: 1.4.0~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/cfd/commitdiff_plain/59b8d96508ed3becd57a5fb9ae1d3368d5074f94?hp=0b5f869b689a085655df9e1a261eacf8c7facade

Merge branch '1.3.x'

* 1.3.x:
  Release 1.3.15.
  mdwsetup.py: Adjust exit status from `subprocess'.
  mdwsetup.py: Fix unbound variable reference in error case.
  mdwsetup.py: Add missing `OS.' qualifier on `W...' calls.
  texinice.tex: Cope with new names for page-dimension registers.
  Makefile.am:  Tweak `silent-rules' machinery.
  auto-version.in: Don't insist that `.git' is a directory.
---

diff --git a/debian/changelog b/debian/changelog
index 35b4ece..1ec7b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ cfd (1.3.99~) experimental; urgency=medium
 
  -- Mark Wooding <mdw@distorted.org.uk>  Tue, 01 Oct 2019 12:53:43 +0100
 
+cfd (1.3.15) experimental; urgency=medium
+
+  * Fix `auto-version' to work in external worktrees.
+  * Fix `texinice.tex' to work with later versions of Texinfo.
+  * Fix a number of minor bugs in `mdwsetup.py'.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Fri, 08 May 2020 12:28:11 +0100
+
 cfd (1.3.14) experimental; urgency=low
 
   * Fix various `gplmumble.tex' files so that they can be included from
diff --git a/mdwsetup.py b/mdwsetup.py
index a6ca3f4..dfa217e 100644
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -59,10 +59,10 @@ class SubprocessFailure (Exception):
     me.file = file
     me.rc = rc
   def __str__(me):
-    if WIFEXITED(me.rc):
-      return '%s failed (rc = %d)' % (me.file, WEXITSTATUS(me.rc))
-    elif WIFSIGNALED(me.rc):
-      return '%s died (signal %d)' % (me.file, WTERMSIG(me.rc))
+    if OS.WIFEXITED(me.rc):
+      return '%s failed (rc = %d)' % (me.file, OS.WEXITSTATUS(me.rc))
+    elif OS.WIFSIGNALED(me.rc):
+      return '%s died (signal %d)' % (me.file, OS.WTERMSIG(me.rc))
     else:
       return '%s died inexplicably' % (me.file)
 
@@ -181,7 +181,7 @@ class Generate (BaseGenFile):
     temp = me.target + '.new'
     with open(temp, 'w') as ft:
       rc = SUB.call([SYS.executable, me.sources[0]], stdout = ft)
-    if rc != 0: raise SubprocessFailure, (source, rc)
+    if rc != 0: raise SubprocessFailure, (me.sources[0], rc << 8)
     OS.rename(temp, me.target)
 
 ## Backward compatibility.