Changed the reinstallation to stop in case of unfixable loss of unionfs image.

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

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 23a6091..6b9766f 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_20180711025725
+       MYVERSION=4.0.0+toward_4.0.1_20180711170650
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index effe2de..1046fb2 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -15,7 +15,6 @@ PKGSYS_AVR_REFETCH_TIMES_FOR_CHKSUMERR=2      #  Number (integer) of retrials for che
 # ============= Check implementation of the ports tree =============
 pkgsys_chk_ports_tree_implementation ()
 {
-       local var tmp_work
        fs_fix_unionfs_image_if_hidden "${PORTSDIR}/Mk/bsd.port.mk" || :
        fs_fix_unionfs_image_if_hidden "${PORTSDIR}/Makefile" || :
        if [ ! -d "${PORTSDIR}" ]

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index e99a71e..542ccdb 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -167,7 +167,7 @@ reinstall_make ()
 # ============= Error process during reinstallation =============
 reinstall_errproc ()
 {
-       local position msg
+       local position msg port_path
        position=$1
        msg=$2
        database_build_update_pkgname "$REINSTALL_ORIGIN" > /dev/null
@@ -180,6 +180,9 @@ reinstall_errproc ()
        database_record_failure "$REINSTALL_ORIGIN" noclean
        fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/stage.loop_list/reinst_todo.remain"
        message_report_failure_for_a_port "$REINSTALL_ORIGIN"
+       port_path=`pkgsys_get_portpath_from_origin "$REINSTALL_ORIGIN"`
+       { fs_fix_unionfs_image_if_hidden "$port_path" \
+               && pkgsys_chk_ports_tree_implementation; } || exit 1
 }
 
 # ============= Check the latest stage for a port =============