Fix a bug that escaped conflict and old version were not restored after failure of...

 Changes to be committed:
	modified:   lib/libmain.sh
	modified:   lib/libreinstall.sh

diff --git a/lib/libmain.sh b/lib/libmain.sh
index bb1dc3d..c4b3d4b 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_20180712021919
+       MYVERSION=4.0.0+toward_4.0.1_20180712105800
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 5de0826..fdb1007 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -1056,6 +1056,8 @@ reinstall_exec ()
                pkg=`pkg_get_remote_repository_version "$REINSTALL_ORIGIN" || :`
                if [ -z "$pkg" ]
                then
+                       reinstall_restore_conflicts "$REINSTALL_ORIGIN"
+                       reinstall_restore_if_temporarily_deinstalled
                        reinstall_skip "ERROR: Failed to get the repository version."
                        return
                fi
@@ -1070,6 +1072,7 @@ reinstall_exec ()
                        return
                fi
                message_echo "INFO: The latest repository version $pkg will be installed."
+               reinstall_pkg_backup || :
                reinstall_deinstall_old_ports
                reinstall_deinstall
                reinstall_backup_and_delete_remaining_install_conflicts__by_pkg "$pkg"
@@ -1084,6 +1087,8 @@ reinstall_exec ()
                else
                        message_echo "ERROR: Failed install the version in the repository for a port to freeze. Dependents are locked." >&2
                fi
+               reinstall_restore_conflicts "$REINSTALL_ORIGIN"
+               reinstall_restore_if_temporarily_deinstalled
                reinstall_skip 'Skipped because being a port to freeze.'
                return
        fi