Version 3.0.0+toward_3.0.1_20130609060102

[BUG FIX] Reinstallation processes were unintentionally terminated when the backup package creation was unsuccessful.

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

diff --git a/bin/portsreinstall b/bin/portsreinstall
index a7b0ba9..baa336b 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.0
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.0+toward_3.0.1_20130608031815
+MYVERSION=3.0.0+toward_3.0.1_20130609060102
 COMPATIBLE_VERSIONS='^(3\.0\.0\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
 
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 48ce3d3..734dce8 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -327,7 +327,7 @@ reinstall_pkg_backup ()
                        echo "$backup_pkg" > $REINSTALL_DBNODE_DIR/backedup_pkgfile
                else
                        message_echo "WARNING: Failed to create the backup package, but ignored by hoping success." >&2
-                       break
+                       return 1
                fi
        fi
        reinstall_register_stage_complete PKG_BACKUP
@@ -577,7 +577,7 @@ reinstall_exec ()
                                fi
                                if $func_pkg_inst_remote_fetch "$REINSTALL_NEWPKGNAME"
                                then
-                                       reinstall_pkg_backup
+                                       reinstall_pkg_backup || :
                                        reinstall_register_stage in_add_pkg
                                        reinstall_deinstall
                                        if $func_pkg_inst_remote "$REINSTALL_NEWPKGNAME"
@@ -743,7 +743,7 @@ reinstall_exec ()
        else
                reinstall_register_stage in_install
        fi
-       reinstall_pkg_backup
+       reinstall_pkg_backup || :
        if [ -e "$REINSTALL_DBNODE_DIR/BEFOREDEINSTALL.conf" ] && ! reinstall_chk_stage_complete BEFOREDEINSTALL
        then
                if [ -n "$REINSTALL_CURRENTPKG" ]

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index a75e244..0d831f5 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -910,6 +910,8 @@ Configuration file of \fBportupgrade\fR(1).
 [BUG FIX] Leaf ports replaced by REPLACE_* were recognized to be new leaf ports to delete even if they are targets of \fB\-O\fR, \fB\-T\fR or \fB\-t\fR or in the needed list.
 
 [BUG FIX] Evaluation of glob patterns which have the form of port origin was inappropriately ambiguous.
+
+[BUG FIX] Reinstallation processes were unintentionally terminated when the backup package creation was unsuccessful.
 .TP
 3.0.0 (01 June 2013)
 [NEW] Options of \fB\-a\fR, \fB\-A\fR, \fB\-b\fR, \fB\-B\fR, \fB\-C\fR, \fB\-D\fR, \fB\-g\fR, \fB\-G\fR, \fB\-i\fR, \fB\-I\fR, \fB\-l\fR, \fB\-L\fR, \fB\-M\fR, \fB\-n\fR, \fB\-o\fR, \fB\-O\fR, \fB\-X\fR and \fB\-Y\fR are added (\fB\-X\fR is redefined as a different function).