[IMPROVED] It is changed to unlock in all error termination.

 Changes to be committed:
	modified:   lib/libmain.sh
	modified:   lib/libtemp.sh
	modified:   man/portsreinstall.8

diff --git a/lib/libmain.sh b/lib/libmain.sh
index c4b3d4b..c43bcf4 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.0.1
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.0.1_20180712105800
+       MYVERSION=4.0.0+toward_4.0.1_20180713192609
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/libtemp.sh b/lib/libtemp.sh
index 365a405..4c5b52e 100644 (file)
--- a/lib/libtemp.sh
+++ b/lib/libtemp.sh
@@ -18,7 +18,7 @@ temp_warn_obsolete_temp_db () { :; }
 # ============= Creation of temporary work directories =============
 temp_trap_init ()
 {
-       trap 'errno=$?; temp_warn_obsolete_temp_db >&2; temp_warn_obsolete_temp_db () { :; }; temp_terminate_process $errno >&2; temp_terminate_process () { :; }; rm -rf "${TMPDIR}" 2> /dev/null; [ -n "${DBDIR}" -a x`cat "${DBDIR}/.lock" 2> /dev/null` = x$$ ] && rm -f "${DBDIR}/.lock"; [ $errno -gt 0 -a $errno -ne 130 ] && message_echo "(Exit code: $errno)" >&2; exit $errno' 0 1 2 3 9 15 17 18
+       trap 'errno=$?; temp_warn_obsolete_temp_db >&2 || :; temp_warn_obsolete_temp_db () { :; }; temp_terminate_process $errno >&2 || :; temp_terminate_process () { :; }; rm -rf "${TMPDIR}" 2> /dev/null; [ -n "${DBDIR}" -a x`cat "${DBDIR}/.lock" 2> /dev/null` = x$$ ] && rm -f "${DBDIR}/.lock"; [ $errno -gt 0 -a $errno -ne 130 ] && message_echo "(Exit code: $errno)" >&2; exit $errno' 0 1 2 3 9 15 17 18
        { until TMPDIR=`mktemp -dq /tmp/"${APPNAME}".XXXXXXXX` ; do : ; done ; }
        chgrp "`id -gn`" "${TMPDIR}"
 }

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 09ca712..3333888 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -1087,6 +1087,8 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [IMPROVED] It is changed so that ports to freeze are upgraded to the latest available package version.
 .PP
+[IMPROVED] It is changed to unlock in all error termination.
+.PP
 [BUG FIX] Changes made by commands or in ${LOCALBASE}/etc/portsreinstall.conf were not reflected to dependents of the specified ports in the redo runs with incorrect messages notifying as already inspected merged ports.
 .PP
 [BUG FIX] Unmounting of file systems by \fBportsreinstall\-chroot\fR(8) had some problems due to inclusion of redundant series of slashes in the path.