Version 3.0.3+toward_3.0.4_20130812154855

[IMPROVED] Changes are made so that MAKE_JOBS_UNSAFE=yes is set in retrials of build and installation.

	modified:   bin/portsreinstall
	modified:   lib/libreinstall.sh
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index effad57..2a8a701 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -12,11 +12,11 @@
 # ============ Set up of environment =============
 APPNAME=`basename "$0"`
 
-MYVERSION=3.0.3
-COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
+# MYVERSION=3.0.3
+# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-# MYVERSION=3.0.2+toward_3.0.3_20130731211606
-# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
+MYVERSION=3.0.3+toward_3.0.4_20130812154855
+COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
 LIBDIR=${MYPREFIX}/lib/${APPNAME}

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index f720d35..05d0cd3 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -810,7 +810,7 @@ reinstall_exec ()
                                return
                        }
                        reinstall_register_stage_complete CLEAN_BEFORE_BUILD
-                       reinstall_make build || \
+                       reinstall_make build MAKE_JOBS_UNSAFE=yes || \
                        {
                                reinstall_restore_conflicts "$REINSTALL_ORIGIN"
                                reinstall_restore_if_temporarily_deinstalled
@@ -861,7 +861,7 @@ reinstall_exec ()
                                        reinstall_make deinstall \
                                                || message_echo "WARNING: Continuing by hoping a success." >&2
                                        message_echo "INFO: Retrying the installation."
-                                       reinstall_make $insttarget
+                                       reinstall_make $insttarget MAKE_JOBS_UNSAFE=yes
                                }
                        then
                                touch "$REINSTALL_DBNODE_DIR/installed_timestamp"

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index c3cb0db..0ba75c0 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -907,6 +907,11 @@ Configuration file of \fBportupgrade\fR(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
+3.0.4 (? August 2013)
+.RS
+[IMPROVED] Changes are made so that MAKE_JOBS_UNSAFE=yes is set in retrials of build and installation.
+.RE
+.TP
 3.0.3 (2 August 2013)
 .RS
 [BUG FIX] Cleaning of distfiles before retrial of failed fetch was forgotten.