From 51a53d4b09d6dad870294d5ef3182c2f057fea1a Mon Sep 17 00:00:00 2001
From: Mamoru Sakaue / MwGhennndo <glmwghennndo@users.sourceforge.jp>
Date: Sun, 9 Sep 2018 15:54:39 +0800
Subject: [PATCH] Fixed a bug that ok, taboo, freeze, need and noneed commands
 lost their functionality.

 Changes to be committed:
	modified:   lib/libcommand_flexconf.sh
	modified:   lib/libmain.sh
	modified:   lib/main/libcommand.sh
---
 lib/libcommand_flexconf.sh | 43 +++++++++++++++++++++++++++++++++++--------
 lib/libmain.sh             |  2 +-
 lib/main/libcommand.sh     | 10 +++++-----
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/lib/libcommand_flexconf.sh b/lib/libcommand_flexconf.sh
index 55e918d..2a1ca68 100644
--- a/lib/libcommand_flexconf.sh
+++ b/lib/libcommand_flexconf.sh
@@ -42,6 +42,13 @@ command_flexconf_update_ok ()
 	mv "$dbfile.tmp" "$dbfile"
 	message_echo "Now the following ports have been manually resolved:"
 	message_cat "$dbfile"
+	if [ `cat "$dbfile" 2> /dev/null | wc -l` -gt 0 ]
+	then
+		message_echo "Now the following ports are registered to be manually resolved:"
+		message_cat "$dbfile"
+	else
+		message_echo "No port is registered to be manually resolved."
+	fi
 }
 
 # ============= Register/deregister taboo ports in the command line form =============
@@ -62,8 +69,13 @@ command_flexconf_update_taboo ()
 		;;
 	esac
 	fileedit_combine_lists "${DBDIR}/conf/TABOO:PORTS.parsed" "${DBDIR}/taboo.list" > ${DBDIR}/taboo.all.list
-	message_echo "Now the following ports are registered as taboo:"
-	message_cat "${DBDIR}/taboo.all.list"
+	if [ `cat "${DBDIR}/taboo.all.list" 2> /dev/null | wc -l` -gt 0 ]
+	then
+		message_echo "Now the following ports are registered to be taboo:"
+		message_cat "${DBDIR}/taboo.all.list"
+	else
+		message_echo "No port is registered to be taboo."
+	fi
 }
 
 # ============= Register/deregister freeze ports in the command line form =============
@@ -84,8 +96,13 @@ command_flexconf_update_freeze ()
 		;;
 	esac
 	fileedit_combine_lists "${DBDIR}/conf/FREEZE:PORTS.parsed" "${DBDIR}/freeze.list" > ${DBDIR}/freeze.all.list
-	message_echo "Now the following ports are registered to freeze:"
-	message_cat "${DBDIR}/freeze.all.list"
+	if [ `cat "${DBDIR}/freeze.all.list" 2> /dev/null | wc -l` -gt 0 ]
+	then
+		message_echo "Now the following ports are registered to be freeze:"
+		message_cat "${DBDIR}/freeze.all.list"
+	else
+		message_echo "No port is registered to be freeze."
+	fi
 }
 
 # ============= Register/deregister needed ports in the command line form =============
@@ -109,8 +126,13 @@ command_flexconf_update_need ()
 		sed -E -f "${DBDIR}/REPLACE.complete_sed_pattern" "${DBDIR}/need.list" || :
 		cat "${DBDIR}/need.list" || :
 	} 2> /dev/null | sort -u > ${DBDIR}/need.with_replaced.list
-	message_echo "Now the following ports are registered to be necessary:"
-	message_cat "${DBDIR}/need.list"
+	if [ `cat "${DBDIR}/need.list" 2> /dev/null | wc -l` -gt 0 ]
+	then
+		message_echo "Now the following ports are registered to be necessary:"
+		message_cat "${DBDIR}/need.list"
+	else
+		message_echo "No port is registered to be necessary."
+	fi
 }
 
 # ============= Register/deregister unneeded ports in the command line form =============
@@ -130,6 +152,11 @@ command_flexconf_update_noneed ()
 		message_echo "$evalated_globs is/are deregistered from the list of unnecessary ports."
 		;;
 	esac
-	message_echo "Now the following ports are registered to be unnecessary:"
-	message_cat "${DBDIR}/noneed.list"
+	if [ `cat "${DBDIR}/noneed.list" 2> /dev/null | wc -l` -gt 0 ]
+	then
+		message_echo "Now the following ports are registered to be unnecessary:"
+		message_cat "${DBDIR}/noneed.list"
+	else
+		message_echo "No port is registered to be unnecessary."
+	fi
 }
diff --git a/lib/libmain.sh b/lib/libmain.sh
index dc7e55d..3b093e8 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_20180827231737
+	MYVERSION=4.0.0+toward_4.1.0_20180909155220
 	COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index dac453f..8b8e83a 100644
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -328,7 +328,7 @@ command_all_exec_irrespective_of_saved_options ()
 	case $COMMAND_MODE in
 	ok )
 		_command_exec_irrespective_of_saved_options__notify_ignored_options
-		command_flexconf_update_ok "$@"
+		command_flexconf_update_ok "$COMMAND_OPERATION" "$@"
 		exit
 		;;
 	taboo | freeze | need | noneed )
@@ -337,20 +337,20 @@ command_all_exec_irrespective_of_saved_options ()
 		echo "$@" >> ${DBDIR}/journal/$COMMAND_MODE
 		case $COMMAND_MODE in
 		taboo )
-			command_flexconf_update_taboo "$@"
+			command_flexconf_update_taboo "$COMMAND_OPERATION" "$@"
 			;;
 		freeze )
-			command_flexconf_update_freeze "$@"
+			command_flexconf_update_freeze "$COMMAND_OPERATION" "$@"
 			;;
 		need )
 			program_deregister_stage_complete DETERMINE_SPECIFIED_TARGETS
 			program_deregister_stage_complete ALL_COMPLETE
-			command_flexconf_update_need "$@"
+			command_flexconf_update_need "$COMMAND_OPERATION" "$@"
 			;;
 		noneed )
 			program_deregister_stage_complete INSPECT_PRIMARY_LEAF_PORTS
 			program_deregister_stage_complete ALL_COMPLETE
-			command_flexconf_update_noneed "$@"
+			command_flexconf_update_noneed "$COMMAND_OPERATION" "$@"
 			;;
 		esac
 		exit
-- 
2.11.0