From f3b8d7f39562626dfd713a8affda79ec82dcea3c Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Tue, 21 Aug 2018 15:20:20 +0800 Subject: [PATCH] Skipping of reinstallation due to missing or old requirements is changed from failure to skip. So the list of failure becomes more fundamental. Changes to be committed: modified: lib/libcommand_do.sh modified: lib/libmain.sh modified: lib/libreinstall.sh --- lib/libcommand_do.sh | 1 + lib/libmain.sh | 2 +- lib/libreinstall.sh | 19 +------------------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/lib/libcommand_do.sh b/lib/libcommand_do.sh index c666b02..8bb43fc 100644 --- a/lib/libcommand_do.sh +++ b/lib/libcommand_do.sh @@ -1117,6 +1117,7 @@ command_do_reinstallation_of_remained_ports () _program_exec_restartable_loop_operation__routine () { reinstall_exec "$@" + temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" } _program_exec_and_record_completion__operation () { diff --git a/lib/libmain.sh b/lib/libmain.sh index bc82d14..e693fdd 100644 --- a/lib/libmain.sh +++ b/lib/libmain.sh @@ -12,7 +12,7 @@ main_set_version () MYVERSION=4.1.0 COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$' # Template for development versions - MYVERSION=4.0.0+toward_4.1.0_20180821142053 + MYVERSION=4.0.0+toward_4.1.0_20180821151910 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$' } diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh index 7665351..83c4498 100644 --- a/lib/libreinstall.sh +++ b/lib/libreinstall.sh @@ -747,7 +747,6 @@ reinstall_closing_operations_after_successful_install () done rm -f "$REINSTALL_FROMNODE_DIR/backedup_pkgfile" database_record_success "$REINSTALL_ORIGIN" - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" message_echo "===> Done successfully" reinstall_register_stage_complete CLOSING_OPERATIONS_AFTER_SUCCESSFUL_INSTALL } @@ -835,8 +834,7 @@ reinstall_chk_missing_requirement () } > "$REINSTALL_DBNODE_DIR/error.log" reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled - reinstall_errproc 'check of missing/too old packages' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" + reinstall_skip 'Skipped because of missing/too old packages' return 1 fi } @@ -956,7 +954,6 @@ reinstall_exec_reinstall_check_sanity () echo "$check_sanity_msg" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'check sanity' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" if [ $opt_fetch_only = yes ] then if [ $opt_inst_by_pkg_if_can = yes ] @@ -1130,7 +1127,6 @@ reinstall_exec_reinstall_freeze_if_necessary () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'freezing' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" reinstall_skip "ERROR: Failed to get the repository version." return 1 fi @@ -1161,7 +1157,6 @@ reinstall_exec_reinstall_freeze_if_necessary () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'freezing' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" reinstall_skip 'Skipped because being a port to freeze.' return } @@ -1208,7 +1203,6 @@ reinstall_exec_reinstall_prebuild () then reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'BEFOREBUILD operations' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi message_echo "-- BEFOREBUILD operations (end)" @@ -1221,7 +1215,6 @@ reinstall_exec_reinstall_prebuild () then reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'clean before build' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi message_echo @@ -1277,7 +1270,6 @@ reinstall_exec_reinstall_fetch () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'fetch' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return fi _reinstall_exec__tmpcmd () { reinstall_make_anymode checksum; } @@ -1286,7 +1278,6 @@ reinstall_exec_reinstall_fetch () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'checksum' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return fi reinstall_register_stage_complete FAILED_FETCH.RETRIAL_2 @@ -1319,7 +1310,6 @@ reinstall_exec_reinstall_chk_interactive_mode () database_build_update_pkgname "$REINSTALL_ORIGIN" > /dev/null message_echo "INFO: Further processes for this port are skipped because it is $msg_is_interactive." fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/stage.loop_list/reinst_todo.remain" - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi fi @@ -1388,7 +1378,6 @@ reinstall_exec_reinstall_build () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'build and clean after build failure' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi reinstall_register_stage_complete CLEAN_BEFORE_BUILD @@ -1402,7 +1391,6 @@ reinstall_exec_reinstall_build () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'retrial of build after failure' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi reinstall_deregister_stage in_retrial_build @@ -1435,7 +1423,6 @@ reinstall_exec_reinstall_stage () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'STAGE operations' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi reinstall_register_stage_complete STAGE @@ -1477,7 +1464,6 @@ reinstall_exec_reinstall_install () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'BEFOREDEINSTALL operations' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi message_echo "-- BEFOREDEINSTALL operations (end)" @@ -1536,7 +1522,6 @@ reinstall_exec_reinstall_install () reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_restore_if_temporarily_deinstalled reinstall_errproc 'install' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi fi @@ -1573,7 +1558,6 @@ reinstall_exec_reinstall_install () then reinstall_restore_conflicts "$REINSTALL_ORIGIN" reinstall_errproc 'AFTERINSTALL operations' - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return 1 fi message_echo "-- AFTERINSTALL operations (end)" @@ -1626,7 +1610,6 @@ reinstall_exec_reinstall () if [ $opt_dry_run = yes ] then message_dry_run - temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}" return fi reinstall_exec_reinstall_by_pkg && return -- 2.11.0