From 7cfd61702a3e7b2b73cd75a810b93cda2c0dc657 Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Thu, 20 Sep 2018 01:26:48 +0900 Subject: [PATCH] Fixed bugs related to command_do_complete_necessary_upgrades_for_build (). Changes to be committed: modified: lib/libcommand_do.sh modified: lib/libdatabase_build.sh modified: lib/libmain.sh --- lib/libcommand_do.sh | 2 +- lib/libdatabase_build.sh | 2 +- lib/libmain.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libcommand_do.sh b/lib/libcommand_do.sh index 81a8fea..d2138d9 100644 --- a/lib/libcommand_do.sh +++ b/lib/libcommand_do.sh @@ -1157,7 +1157,7 @@ command_do_clean_up_of_reinstallation_status_for_preparation () command_do_completion_of_building_the_temporary_database () { local PROGRAM_DEPENDS - PROGRAM_DEPENDS='REDO_INIT SETUP_REINST_TODO CLEANUP_REINST_STATUS PARSE_CONF INSPECT_ALL_DEPENDENCIES RESTORE_ESCAPED_OBSOLETE_PACKAGES_FOR_INSPECTION NECESSARY_UPDATES:direct NECESSARY_UPDATES:full PARSE_TARGET_ATTR_INFO MAKE_DEPENDENTS_LISTS_UNIQUE MAKE_IGNORED_DEPENDENTS_LISTS_UNIQUE COLLECT_LEAF_PORTS_TO_DELETE' + PROGRAM_DEPENDS='REDO_INIT SETUP_REINST_TODO CLEANUP_REINST_STATUS PARSE_CONF INSPECT_ALL_DEPENDENCIES RESTORE_ESCAPED_OBSOLETE_PACKAGES_FOR_INSPECTION COMPLETE_NECESSARY_UPDATES:direct COMPLETE_NECESSARY_UPDATES:full PARSE_TARGET_ATTR_INFO MAKE_DEPENDENTS_LISTS_UNIQUE MAKE_IGNORED_DEPENDENTS_LISTS_UNIQUE COLLECT_LEAF_PORTS_TO_DELETE' _program_exec_and_record_completion__operation () { message_section_title "The temporary database is completely built up" diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh index 74668e8..b8de37a 100644 --- a/lib/libdatabase_build.sh +++ b/lib/libdatabase_build.sh @@ -1031,7 +1031,7 @@ database_build_complete_necessary_upgrades_for_build () do dbpath_requirement=${DBDIR}/requires/$origin_requirement [ -e "$dbpath_requirement/necessary_upgrade.build.${level}" ] || continue - [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || return 0 + [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || continue touch "$dbpath_requirement/necessary_upgrade.run.${level}" database_build_complete_necessary_upgrades_for_build "$origin_requirement" "$level" done < $dbpath/requirements.build.${level} diff --git a/lib/libmain.sh b/lib/libmain.sh index 18cb191..4bbde80 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_20180919231118 + MYVERSION=4.0.0+toward_4.1.0_20180920012630 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$' } -- 2.11.0