• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

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


Commit MetaInfo

Revision46102e5f60715992a502716937e0057da24680a5 (tree)
Time2018-09-18 01:20:55
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

Some fixes about removing unecessary redo.

Changes to be committed:

modified: lib/libcommand_do.sh
modified: lib/libdatabase_query.sh
modified: lib/libmain.sh
modified: lib/libreinstall.sh

Change Summary

Incremental Difference

--- a/lib/libcommand_do.sh
+++ b/lib/libcommand_do.sh
@@ -767,6 +767,7 @@ command_do_complete_necessary_upgrades_for_build ()
767767 do
768768 dbpath_requirement=${DBDIR}/requires/$origin_requirement
769769 [ -e "$dbpath_requirement/necessary_upgrade.build.${level}" ] || continue
770+ [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || return 0
770771 touch "$dbpath_requirement/necessary_upgrade.run.${level}"
771772 done < $dbpath/requirements.build.${level}
772773 :
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -543,10 +543,18 @@ database_query_show_single_list ()
543543 [ -n "$put_blankline" ] && message_echo
544544 while read origin
545545 do
546- [ -n "$flag_negative_listdb" ] && grep -Fx "$origin" "${DBDIR}/$flag_negative_listdb" 2> /dev/null && continue
546+ matches=no
547+ for negative_listdb in $flag_negative_listdb
548+ do
549+ if grep -qFx "$origin" "${DBDIR}/$negative_listdb" 2> /dev/null
550+ then
551+ matches=yes
552+ break
553+ fi
554+ done
555+ [ $matches = no ] && continue
547556 if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
548557 then
549- matches=no
550558 for flag in $flag_filter_skip_unchanged
551559 do
552560 if [ -e "${DBDIR}/requires/$origin/$flag" ]
@@ -672,7 +680,7 @@ database_query_show_single_list_exec ()
672680 list=todo_after_requirements_succeed.$dbsuffix.list
673681 flag_filter_skip_unchanged="necessary_upgrade.$dbsuffix necessary_upgrade_completed.$dbsuffix"
674682 flag_filter_only_target=y
675- flag_negative_listdb=leaf_ports_to_delete.unselected
683+ flag_negative_listdb=leaf_ports_to_delete.selected
676684 ;;
677685 resolved )
678686 message_echo "The following ports had problems which have been manually resolved:"
--- 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_20180916221406
15+ MYVERSION=4.0.0+toward_4.1.0_20180918012038
1616 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
1717 }
1818
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -850,11 +850,12 @@ reinstall_chk_missing_requirement ()
850850 # Return status 1 for port to skip
851851 reinstall_exec_chk_skip ()
852852 {
853- local tag level
853+ local tag level tmpdb
854854 local currentorigin_is_all currentorigin_is_target currentorigin_is_requires_requirements
855855 local currentorigin_is_initial_requirements currentorigin_is_requires_dependents
856856 local currentorigin_is_initial_dependents currentorigin_is_requires_requirements_complement
857857 local currentorigin_is_relevant
858+ tmpdb=${TMPDIR}/reinstall_exec_chk_skip
858859 database_query_get_target_attributes currentorigin "$REINSTALL_ORIGIN"
859860 if [ -z "${currentorigin_is_all}" -a -z "${currentorigin_is_relevant}" ]
860861 then
Show on old repository browser