From 1b32e95098acd55ca2cfeef474e9bc5a0a81ba00 Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Mon, 27 Aug 2018 01:04:41 +0800 Subject: [PATCH] Fixed a bug that ports installed by prebuilt packages were not registered correctly. Changes to be committed: modified: lib/libmain.sh modified: lib/libreinstall.sh --- lib/libmain.sh | 2 +- lib/libreinstall.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libmain.sh b/lib/libmain.sh index 581a3e6..0135c40 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_20180827005243 + MYVERSION=4.0.0+toward_4.1.0_20180827010420 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 305bfe7..238ed49 100644 --- a/lib/libreinstall.sh +++ b/lib/libreinstall.sh @@ -1046,7 +1046,7 @@ reinstall_exec_reinstall_by_pkg () then fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_default_conf.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_custom_conf.list" - fileedit_rm_a_line "$origin" "${DBDIR}/installation_complete_by_pkg.list" + fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/installation_complete_by_pkg.list" if reinstall_deinstall && pkg_is_tool_available && pkg_info_e "$pkg" then reinstall_register_stage_complete INSTALL_BY_PKG @@ -1069,7 +1069,7 @@ reinstall_exec_reinstall_by_pkg () else fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_default_conf.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_custom_conf.list" - fileedit_rm_a_line "$origin" "${DBDIR}/installation_complete_by_pkg.list" + fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/installation_complete_by_pkg.list" reinstall_backup_and_delete_remaining_install_conflicts__by_pkg "$pkg" reinstall_pkg_backup || : reinstall_register_stage in_add_pkg @@ -1112,7 +1112,7 @@ reinstall_exec_reinstall_by_pkg () then touch "$REINSTALL_DBNODE_DIR/installed_timestamp" touch "$REINSTALL_DBNODE_DIR/installed_by_pkg" - fileedit_add_a_line_if_new "$origin" "${DBDIR}/installation_complete_by_pkg.list" + fileedit_add_a_line_if_new "$REINSTALL_ORIGIN" "${DBDIR}/installation_complete_by_pkg.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_custom_conf.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_default_conf.list" reinstall_deregister_stage in_bypkg @@ -1128,7 +1128,7 @@ reinstall_exec_reinstall_by_pkg () message_echo "WARNING: (Re)installation-by-package is unsuccessful, so retrying by using port." >&2 fi fi - fileedit_rm_a_line "$origin" "${DBDIR}/installation_complete_by_pkg.list" + fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/installation_complete_by_pkg.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_custom_conf.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_default_conf.list" return 1 @@ -1482,7 +1482,7 @@ reinstall_exec_reinstall_install () fi fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_default_conf.list" fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/inst_by_port_with_custom_conf.list" - fileedit_rm_a_line "$origin" "${DBDIR}/installation_complete_by_pkg.list" + fileedit_rm_a_line "$REINSTALL_ORIGIN" "${DBDIR}/installation_complete_by_pkg.list" reinstall_pkg_backup || : if [ -e "$REINSTALL_DBNODE_DIR/BEFOREDEINSTALL.conf" ] && ! reinstall_chk_stage_complete BEFOREDEINSTALL then -- 2.11.0