From 29865ea8a5622cdd80b7a69a0afa78004b4cd311 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sun, 23 Jan 2011 20:35:10 +1100 Subject: [PATCH] 2011-01-23 Ralf Wildenhues * config.guess (version): Bump copyright years. (alpha:OSF1:*:*): Reset EXIT trap before exiting to avoid a spurious non-zero exit status on alphaev67-dec-osf5.1. --- ChangeLog | 6 ++++++ config.guess | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b9e628..9fdb2af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-23 Ralf Wildenhues + + * config.guess (version): Bump copyright years. + (alpha:OSF1:*:*): Reset EXIT trap before exiting to avoid a + spurious non-zero exit status on alphaev67-dec-osf5.1. + 2011-01-01 Ben Elliston * config.guess: Update copyright years. diff --git a/config.guess b/config.guess index ed58286..78553c4 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011 Free Software Foundation, Inc. -timestamp='2011-01-01' +timestamp='2011-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead