[NEW] show inst_by_pkg commands are added.

[NEW] Command show status newly supports inst_by_pkg.

 Changes to be committed:
	modified:   lib/libcommand_show.sh
	modified:   lib/libdatabase_query.sh
	modified:   lib/libmain.sh
	modified:   lib/libreinstall.sh
	modified:   lib/main/libcommand.sh
	modified:   lib/main/libusage.sh
	modified:   man/portsreinstall.8

diff --git a/lib/libcommand_show.sh b/lib/libcommand_show.sh
index c6af4dc..1c11ad7 100644 (file)
--- a/lib/libcommand_show.sh
+++ b/lib/libcommand_show.sh
@@ -17,7 +17,7 @@ command_show ()
        [ -n "$COMMAND_SHOW_LEVEL" ] || COMMAND_SHOW_LEVEL=`options_get_dependency_level`
        dbsuffix=$COMMAND_SHOW_DEPTAG.$COMMAND_SHOW_LEVEL
        case $COMMAND_SHOW_SUBJECT in
-       todo | done | redo | resolved | failure | taboo | freeze | need | noneed | deleted | restored | conflict )
+       todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | deleted | restored | conflict )
                database_query_show_single_list_exec "$COMMAND_SHOW_SUBJECT" \
                        "$COMMAND_SHOW_DEPTAG" "$COMMAND_SHOW_LEVEL" || :
                ;;
@@ -63,7 +63,7 @@ command_show ()
                ;;
        status )
                grandtitle="Success/failure status in (re)installation"
-               lists='todo|done|redo|resolved|failure|taboo|freeze|need|noneed|deleted|restored|conflict'
+               lists='todo|done|redo|resolved|inst_by_pkg|failure|taboo|freeze|need|noneed|deleted|restored|conflict'
                database_query_show_list_inclusion_of_matching_port "$grandtitle" "$lists" "$pkgnamedb" \
                        "$COMMAND_SHOW_DEPTAG" "$COMMAND_SHOW_LEVEL" "$@"
                ;;

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index 5e381fa..b6ce643 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -614,6 +614,11 @@ database_query_show_single_list_exec ()
                message_echo
                list=manually_done.list
                ;;
+       inst_by_pkg )
+               message_echo "The following ports are configured default and installed by prebuilt packages"
+               message_echo
+               list=installation_complete_by_pkg.list
+               ;;
        failure )
                message_echo "The following ports experienced failures and kept to be old or uninstalled:"
                message_echo
@@ -716,6 +721,9 @@ database_query_exists_in_list ()
        resolved )
                list=manually_done.list
                ;;
+       inst_by_pkg )
+               list=installation_complete_by_pkg.list
+               ;;
        failure )
                list=failed.list
                ;;

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 3d91332..3b4d99e 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180816020334
+       MYVERSION=4.0.0+toward_4.1.0_20180816023713
        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 ef863b4..4f932ae 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -1100,6 +1100,7 @@ reinstall_exec_reinstall_by_pkg ()
                then
                        touch "$REINSTALL_DBNODE_DIR/installed_timestamp"
                        touch "$REINSTALL_DBNODE_DIR/installed_by_pkg"
+                       fileedit_add_a_line_if_new "$origin" "${DBDIR}/installation_complete_by_pkg.list"
                        reinstall_deregister_stage in_bypkg
                        reinstall_tell_update_to_depandents
                        reinstall_closing_operations_after_successful_install
@@ -1113,6 +1114,7 @@ reinstall_exec_reinstall_by_pkg ()
                        message_echo "WARNING: (Re)installation-by-package is unsuccessful, so retrying by using port." >&2
                fi
        fi
+       fileedit_rm_a_line "$origin" "${DBDIR}/installation_complete_by_pkg.list"
        return 1
 }
 

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index 53f36dc..3a0f139 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -234,7 +234,7 @@ command_all_parse_args ()
                        shift || :
                fi
                case $COMMAND_SHOW_SUBJECT in
-               todo | done | redo | resolved | failure | taboo | freeze | need | noneed | restored | deleted | conflict )
+               todo | done | redo | resolved | inst_by_pkg | failure | taboo | freeze | need | noneed | restored | deleted | conflict )
                        _command_parse_args__chk_no_arg $#
                        ;;
                leaves | obsolete )

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 7a42f6e..9e0f0ff 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -77,7 +77,7 @@ USAGE: portsreinstall [OPTIONS] [--] [command]
           | packupgrade create | packupgrade crop [path] | packupgrade clean
           | make glob [target] [arguments...]
           | glob globs... | pkg globs... | options
-          | show todo | show done | show resolved | show failure | show redo
+          | show todo | show done | show resolved | show inst_by_pkg | show failure | show redo
           | show taboo | show need | show noneed | show restored | show deleted
           | show conflict
           | show leaves [selected | unselected] | show obsolete [selected | unselected]

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 9567ae7..41c760a 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -267,6 +267,10 @@ With \fB\-a\fR option, the first and second columns denote the flavored origin a
 Manually reinstalled ports registered by \fBok\fR command.
 With \fB\-a\fR option, the first and second columns denote the flavored origin and initial/new/current package name, respectively.
 .TP
+\fBinst_by_pkg\fR
+Ports installed by official prebuilt packages because their configurations are default.
+With \fB\-a\fR option, the first and second columns denote the flavored origin and initial/new/current package name, respectively.
+.TP
 \fBfailure\fR
 Failed ports.
 With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, failed make target and manually resolved status (yes or no), respectively.
@@ -337,7 +341,7 @@ In other words, if something is outputted, the port Makefile can have some defec
 .TP
 \fBstatus\fR \fIglob1\fR [\fIglob2\fR ...]
 Current success/failure status in (re)installation of matching ports/packages.
-Returned values are null, "todo", "done", "resolved", "failure", "redo", "taboo", "freeze", "need", "noneed", "restored", "deleted" or "conflict", where null means that they are untouched in the current option configuration or temporary reset due to configuration changes. 
+Returned values are null, "todo", "done", "resolved", "inst_by_pkg", "failure", "redo", "taboo", "freeze", "need", "noneed", "restored", "deleted" or "conflict", where null means that they are untouched in the current option configuration or temporary reset due to configuration changes. 
 .TP
        \fBerrormessage\fR \fIglob1\fR [\fIglob2\fR ...]
 Error message in (re)installation of matching ports/packages.
@@ -1117,7 +1121,9 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [NEW] \fBauto\fR command is added to \fBportsreinstall\-chroot\fR(8).
 .PP
-[NEW] \fBpkg\fR, \fBmake\fR, \fBshow errormessage\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
+[NEW] \fBpkg\fR, \fBmake\fR, \fBshow errormessage\fR, \fBshow inst_by_pkg\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
+.PP
+[NEW] Command \fBshow status\fR newly supports \fBinst_by_pkg\fR.
 .PP
 [NEW] BUILDCONFLICT and INSTCONFLICT sections are added to ${LOCALBASE}/etc/portsreinstall.conf.
 .PP