• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

This is for active development.
New funtionalities are to be added actively.


Commit MetaInfo

Revision7cfd61702a3e7b2b73cd75a810b93cda2c0dc657 (tree)
Time2018-09-20 01:26:48
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

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

Change Summary

Incremental Difference

--- a/lib/libcommand_do.sh
+++ b/lib/libcommand_do.sh
@@ -1157,7 +1157,7 @@ command_do_clean_up_of_reinstallation_status_for_preparation ()
11571157 command_do_completion_of_building_the_temporary_database ()
11581158 {
11591159 local PROGRAM_DEPENDS
1160- 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'
1160+ 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'
11611161 _program_exec_and_record_completion__operation ()
11621162 {
11631163 message_section_title "The temporary database is completely built up"
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -1031,7 +1031,7 @@ database_build_complete_necessary_upgrades_for_build ()
10311031 do
10321032 dbpath_requirement=${DBDIR}/requires/$origin_requirement
10331033 [ -e "$dbpath_requirement/necessary_upgrade.build.${level}" ] || continue
1034- [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || return 0
1034+ [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || continue
10351035 touch "$dbpath_requirement/necessary_upgrade.run.${level}"
10361036 database_build_complete_necessary_upgrades_for_build "$origin_requirement" "$level"
10371037 done < $dbpath/requirements.build.${level}
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
1212 MYVERSION=4.1.0
1313 COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
1414 # Template for development versions
15- MYVERSION=4.0.0+toward_4.1.0_20180919231118
15+ MYVERSION=4.0.0+toward_4.1.0_20180920012630
1616 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
1717 }
1818
Show on old repository browser