Fixed a bug that obsolete or moved ports were not inspected. For this purpose, the...

[portsreinstall/current.git] / lib / libdatabase_build.sh

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index 11a3d81..bef02a7 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -552,9 +552,8 @@ database_build_inspect_dependencies ()
                message_echo "${DEPTH_INDEX} $origin_orig"
                database_build_convert_and_register_origin_if_obsolete__reset_origins_old
                origin_id=`echo "$origin_orig" | tr / :`
-               database_build_setup_initial_node "$origin_orig"
                # Replacement specified by the configuration file, knobs and port options
-               tmp_config=${TMPDIR}/database_build_inspect_dependencies:confi
+               tmp_config=${TMPDIR}/database_build_inspect_dependencies:config
                database_build_setup_replace_node "$origin_orig" "$tmp_config.before" "$tmp_config.after"
                if [ -e "${DBDIR}/replace/$origin_orig/origin" ]
                then
@@ -1149,6 +1148,13 @@ database_build_patch_reconf ()
        database_build_clear_db_dirs "$origin"
 }
 
+# ============= Post-processes after finishing to inspect initial dependencies =============
+database_build_post_inspect_initial_dependencies ()
+{
+       find "${DBDIR}/initial" -depth 2 -type d \
+               | sed -E 's|.*/([^/]+/[^/]+)$|\1|' > ${DBDIR}/inspected_ports.initial
+}
+
 # ============= Post-processes after finishing to inspect dependencies =============
 database_build_post_inspect_dependencies ()
 {
@@ -1157,8 +1163,6 @@ database_build_post_inspect_dependencies ()
        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 \
-               | sed -E 's|.*/([^/]+/[^/]+)$|\1|' > ${DBDIR}/inspected_ports.initial
        sort -u "${DBDIR}/inspected_ports" "${DBDIR}/inspected_ports.initial" > ${DBDIR}/inspected_ports.all
        {
                cat "${DBDIR}/conf/HOLD:PORTS.parsed" || :