Removed unneeded modification on the build of database.

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

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index ce8bce9..7fbda24 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -61,7 +61,6 @@ database_build_convert_and_register_origin_if_obsolete ()
                if [ -n "$origin_new" ]
                then
                        message_echo "${DEPTH_INDEX}  ===> Moved to $origin_new at $date_moved because \"$why_moved\""
-                       fileedit_add_a_line_if_new "$origin_trial" "${DBDIR}/moved_ports"
                        fileedit_add_a_line_if_new "$origin" "${TMPDIR}/database_build_convert_and_register_origin_if_obsolete:origins_old"
                        database_build_convert_and_register_origin_if_obsolete "$origin_new" "${TMPDIR}/MOVED.DB" || return 1
                else
@@ -241,7 +240,6 @@ database_build_setup_replace_node ()
                then
                        if [ -n "$origin" ]
                        then
-                               fileedit_add_a_line_if_new "$origin_trial" "${DBDIR}/moved_ports"
                                message_echo "${DEPTH_INDEX}  ===> Transferred to $origin"
                        else
                                fileedit_add_a_line_if_new "$origin" "${DBDIR}/obsolete_ports"
@@ -286,7 +284,6 @@ database_build_is_port_already_inspected_in_required_level ()
        {
                cat "${DBDIR}/ports.inspected.${inspected_level}.list" || :
                cat "${DBDIR}/obsolete_ports" || :
-               cat "${DBDIR}/moved_ports" || :
        }  2> /dev/null | grep -q -Fx "$origin_actual" || return
        fileedit_rm_a_line "$origin" "${DBDIR}/stage.loop_list/ports_to_inspect.remain"
        [ "x$origin" = "$origin_actual" ] || \
@@ -547,7 +544,6 @@ database_build_inspect_dependencies ()
                        if ! grep -qFx "$origin" "${DBDIR}/done_required_ports_to_inspect" 2> /dev/null
                        then
                                fileedit_rm_a_line "$origin" "${DBDIR}/obsolete_ports"
-                               fileedit_rm_a_line "$origin" "${DBDIR}/moved_ports"
                                dbpath=${DBDIR}/requires/$origin
                                dbpath_prev=${DBDIR}/prevset/requires/$origin
                                if [ ! -e "$dbpath/complete_as_node" ] || \
@@ -1073,7 +1069,6 @@ _database_build_reset_a_port_confdb ()
                fileedit_rm_a_line "$origin" "${DBDIR}/ports.inspected.${level}.list"
        done
        fileedit_rm_a_line "$origin" "${DBDIR}/obsolete_ports"
-       fileedit_rm_a_line "$origin" "${DBDIR}/moved_ports"
        fileedit_rm_a_line "$origin" "${DBDIR}/ports.inspected.list"
        cat "${DBDIR}/replace/$origin/origin" 2> /dev/null || :
 }
@@ -1119,7 +1114,7 @@ database_build_post_inspect_dependencies ()
 {
        local table tmpfile
        tmpfile=${TMPDIR}/database_build_post_inspect_dependencies
-       touch "${DBDIR}/obsolete_ports" "${DBDIR}/moved_ports" "${DBDIR}/inspected_ports.update"
+       touch "${DBDIR}/obsolete_ports" "${DBDIR}/inspected_ports.update"
        find "${DBDIR}/requires" -depth 2 -type d \
                | sed -E 's|.*/([^/]+/[^/]+)$|\1|' > ${DBDIR}/inspected_ports
        find "${DBDIR}/initial" -depth 2 -type d \

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