From 58f4146480c07138c20560f124d882d753d0bea5 Mon Sep 17 00:00:00 2001
From: Mamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Date: Wed, 19 Sep 2018 11:12:05 +0900
Subject: [PATCH] Fixed a bug that unselected leaf ports were skipped in
 reinstalltion. Fixed a bug that show commands took the negative lists
 oppositely.

 Changes to be committed:
	modified:   lib/libdatabase_query.sh
	modified:   lib/libmain.sh
	modified:   lib/libreinstall.sh
---
 lib/libdatabase_query.sh | 13 +++++++------
 lib/libmain.sh           |  2 +-
 lib/libreinstall.sh      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 743a568..4936b4a 100644
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -506,7 +506,7 @@ database_query_show_two_column_lists ()
 # ============= Output of "show" command for a single list =============
 database_query_show_single_list ()
 {
-	local list pkgnamedb flag_filter_skip_unchanged flag_filter_only_target flag_negative_listdb tmpflag_exists put_blankline origin matches flag pkg table
+	local list pkgnamedb flag_filter_skip_unchanged flag_filter_only_target flag_negative_listdb tmpflag_exists put_blankline origin matches_negative matches_positive flag pkg table
 	local currentorigin_is_alll 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 currentorigin_is_relevant
@@ -543,27 +543,28 @@ database_query_show_single_list ()
 	[ -n "$put_blankline" ] && message_echo
 	while read origin
 	do
-		matches=no
+		matches_negative=no
 		for negative_listdb in $flag_negative_listdb
 		do
 			if grep -qFx "$origin" "${DBDIR}/$negative_listdb" 2> /dev/null
 			then
-				matches=yes
+				matches_negative=yes
 				break
 			fi
 		done
-		[ $matches = no ] && continue
+		[ $matches_negative = yes ] && continue
 		if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
 		then
+			matches_positive=no
 			for flag in $flag_filter_skip_unchanged
 			do
 				if [ -e "${DBDIR}/requires/$origin/$flag" ]
 				then
-					matches=yes
+					matches_positive=yes
 					break
 				fi
 			done
-			[ $matches = no ] && continue
+			[ $matches_positive = no ] && continue
 		fi
 		if [ -n "$flag_filter_only_target" ]
 		then
diff --git a/lib/libmain.sh b/lib/libmain.sh
index bf4b667..a116e4f 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_20180918212945
+	MYVERSION=4.0.0+toward_4.1.0_20180919111149
 	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 26f2558..2381397 100644
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -862,7 +862,7 @@ reinstall_exec_chk_skip ()
 		reinstall_skip 'Skipped because being irrelevant'
 		return 1
 	fi
-	reinstall_skip_if_in_a_list 'Skipped because being a leaf port' leaf_ports_to_delete && return 1
+	reinstall_skip_if_in_a_list 'Skipped because being a leaf port' leaf_ports_to_delete.selected && return 1
 	rm -f "$REINSTALL_DBNODE_DIR/this_is_skipped_build_requirement"
 	if expr "$REINSTALL_CURRENTPKG" : '.* .*' > /dev/null
 	then
-- 
2.11.0