From 46102e5f60715992a502716937e0057da24680a5 Mon Sep 17 00:00:00 2001
From: Mamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Date: Tue, 18 Sep 2018 01:20:55 +0900
Subject: [PATCH] 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
---
 lib/libcommand_do.sh     |  1 +
 lib/libdatabase_query.sh | 14 +++++++++++---
 lib/libmain.sh           |  2 +-
 lib/libreinstall.sh      |  3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/libcommand_do.sh b/lib/libcommand_do.sh
index 77ef626..0f82db2 100644
--- a/lib/libcommand_do.sh
+++ b/lib/libcommand_do.sh
@@ -767,6 +767,7 @@ command_do_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
 				touch "$dbpath_requirement/necessary_upgrade.run.${level}"
 			done < $dbpath/requirements.build.${level}
 			:
diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 4ced7ce..743a568 100644
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -543,10 +543,18 @@ database_query_show_single_list ()
 	[ -n "$put_blankline" ] && message_echo
 	while read origin
 	do
-		[ -n "$flag_negative_listdb" ] && grep -Fx "$origin" "${DBDIR}/$flag_negative_listdb" 2> /dev/null && continue
+		matches=no
+		for negative_listdb in $flag_negative_listdb
+		do
+			if grep -qFx "$origin" "${DBDIR}/$negative_listdb" 2> /dev/null
+			then
+				matches=yes
+				break
+			fi
+		done
+		[ $matches = no ] && continue
 		if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
 		then
-			matches=no
 			for flag in $flag_filter_skip_unchanged
 			do
 				if [ -e "${DBDIR}/requires/$origin/$flag" ]
@@ -672,7 +680,7 @@ database_query_show_single_list_exec ()
 		list=todo_after_requirements_succeed.$dbsuffix.list
 		flag_filter_skip_unchanged="necessary_upgrade.$dbsuffix necessary_upgrade_completed.$dbsuffix"
 		flag_filter_only_target=y
-		flag_negative_listdb=leaf_ports_to_delete.unselected
+		flag_negative_listdb=leaf_ports_to_delete.selected
 		;;
 	resolved )
 		message_echo "The following ports had problems which have been manually resolved:"
diff --git a/lib/libmain.sh b/lib/libmain.sh
index 4f572ba..0844df4 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_20180916221406
+	MYVERSION=4.0.0+toward_4.1.0_20180918012038
 	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 55c6400..26f2558 100644
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -850,11 +850,12 @@ reinstall_chk_missing_requirement ()
 # Return status 1 for port to skip
 reinstall_exec_chk_skip ()
 {
-	local tag level
+	local tag level tmpdb
 	local currentorigin_is_all currentorigin_is_target currentorigin_is_requires_requirements
 	local currentorigin_is_initial_requirements currentorigin_is_requires_dependents
 	local currentorigin_is_initial_dependents currentorigin_is_requires_requirements_complement
 	local currentorigin_is_relevant
+	tmpdb=${TMPDIR}/reinstall_exec_chk_skip
 	database_query_get_target_attributes currentorigin "$REINSTALL_ORIGIN"
 	if [ -z "${currentorigin_is_all}" -a -z "${currentorigin_is_relevant}" ]
 	then
-- 
2.11.0