Commands of show build_conflict_pkgs and show inst_conflict_pkgs are added.

 Changes to be committed:
	modified:   lib/libcommand_show.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 1c11ad7..5f5ce8e 100644 (file)
--- a/lib/libcommand_show.sh
+++ b/lib/libcommand_show.sh
@@ -25,6 +25,20 @@ command_show ()
                database_query_show_single_list_exec "$COMMAND_SHOW_SUBJECT" \
                        "$COMMAND_SHOW_KEYWORD" '' || :
                ;;
+       build_conflict_pkgs | inst_conflict_pkgs )
+               case $COMMAND_SHOW_SUBJECT in
+               build_conflict_pkgs )
+                       mode=build
+                       ;;
+               inst_conflict_pkgs )
+                       mode=install
+                       ;;
+               esac
+               pkgsys_eval_ports_glob "$@" | while read origin
+               do
+                       pkgsys_get_conflicting_installed_pkgs "$mode" "$origin"
+               done | sort -u
+               ;;
        initrequirements )
                grandtitle="Dependencies based on the initially installed packages"
                title="The following port(s) was/were required by %s:"
@@ -56,7 +70,7 @@ command_show ()
        conflict_files )
                grandtitle="Possible additional conflict files"
                title="The following packages' files conflict with %s:"
-               list=possible_additional_conflist.csv
+               list=possible_additional_conflict.csv
                listdb='requires'
                pkgnamedb='moved_from'
                database_query_show_two_column_lists "$grandtitle" "$title" "$list" "$listdb" "$pkgnamedb" "$@"

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 3b4d99e..d0714e6 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_20180816023713
+       MYVERSION=4.0.0+toward_4.1.0_20180817143841
        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 4f932ae..5236577 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -298,7 +298,7 @@ reinstall_backup_and_delete_remaining_install_conflicts ()
 {
        local stagedir tmp_conflicts db_conflict
        tmp_conflicts=${TMPDIR}/reinstall_backup_and_delete_remaining_install_conflicts
-       db_conflict=$REINSTALL_DBNODE_DIR/possible_additional_conflist.csv
+       db_conflict=$REINSTALL_DBNODE_DIR/possible_additional_conflict.csv
        message_echo "(Checking installation conflict...)"
        rm -rf "$db_conflict.tmp" "$tmp_conflicts".*
        stagedir=`database_query_get_makevar_val "$REINSTALL_ORIGIN" STAGEDIR`
@@ -341,7 +341,7 @@ reinstall_backup_and_delete_remaining_install_conflicts ()
 reinstall_remove_needless_possible_conflict ()
 {
        local db_conflict db_forbidden suffix tmp_db
-       db_conflict=$REINSTALL_DBNODE_DIR/possible_additional_conflist.csv
+       db_conflict=$REINSTALL_DBNODE_DIR/possible_additional_conflict.csv
        db_forbidden=${DBDIR}/forbidden_conflicts
        tmp_db=${TMPDIR}/reinstall_remove_needless_possible_conflict:db
        [ -e "$db_conflict" ] || return 0

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index 3a0f139..70cc6cf 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -249,7 +249,7 @@ command_all_parse_args ()
                        shift || :
                        _command_parse_args__chk_no_arg $#
                        ;;
-               initrequirements | requirements | initdependents | dependents | conflict_files | status | errormessage )
+               build_conflict_pkgs | inst_conflict_pkgs | initrequirements | requirements | initdependents | dependents | conflict_files | status | errormessage )
                        _command_parse_args__chk_glob_args $#
                        ;;
                *)

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 9e0f0ff..679c1d3 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -80,6 +80,7 @@ USAGE: portsreinstall [OPTIONS] [--] [command]
           | 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 build_conflict_pkgs | show inst_conflict_pkgs
           | show leaves [selected | unselected] | show obsolete [selected | unselected]
           | show requirements glob... | show dependents glob...
           | show initrequirements glob... | show initdependents glob...

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 41c760a..0da02ef 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -268,7 +268,7 @@ 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.
+Ports installed by the default 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
@@ -307,6 +307,14 @@ With \fB\-a\fR option, the first and second columns denote the flavored origin a
 Conflicting ports which are temporarily deleted.
 With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, and opponent ports concatenated by comma respectively.
 .TP
+\fBbuild_conflict_pkgs\fR \fIglob\fR [\fIglob2\fR...]
+Installed packages which conflict with ports matching \fIglob\fRs in the build.
+The package names are listed in a single column.
+.TP
+\fBinst_conflict_pkgs\fR \fIglob\fR [\fIglob2\fR...]
+Installed packages which conflict with ports matching \fIglob\fRs in the installation.
+The package names are listed in a single column.
+.TP
 \fBleaves\fR [\fBselected\fR | \fBunselected\fR]
 All detected leaf ports.
 Keywords \fBselected\fR and \fBunselected\fR are for filtering only selected (to be deleted) and unselected (to be preserved) ones, respectively.
@@ -1121,7 +1129,7 @@ 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 inst_by_pkg\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
+[NEW] \fBpkg\fR, \fBmake\fR, \fBshow build_conflict_pkgs\fR, \fBshow inst_conflict_pkgs\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
@@ -1165,7 +1173,7 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [BUG FIX] Evaluation of globs was incorrect for the regular expression form.
 .PP
-[BUG FIX] Flavored requirements were incorrectly inspected. This also caused disability of the use of prebuilt official packages for flavord ports with the default configuration. 
+[BUG FIX] Flavored requirements were incorrectly inspected. This also caused disability of the use of default packages for flavord ports with the default configuration. 
 .PP
 [BUG FIX] The message about the evaluated dependency level in \fBshow\fR command was wrong. 
 .RE
@@ -1367,8 +1375,6 @@ and select "y" in the queries for spoiled packages.
 .PP
 [CHANGED] Changes are made so that FORCE_PKG_REGISTER is disabled in the all operations. This had become obsolete and even harmful after the implementation of the automatic workaround function for conflicts.
 .PP
-[MISC] Minor changes are made on HISTORY section of the manual page in the level of coding and terminology.
-.PP
 [BUG FIX] Configuration changes in replacement were not completely reflected by redo with \fB\-L\fR option and ended up with errors.
 .PP
 [BUG FIX] Deinstallation of obsolete or new leaf ports did not work in version 3.0.1.
@@ -1376,6 +1382,8 @@ and select "y" in the queries for spoiled packages.
 [BUG FIX] Conflicts escape was not implemented for (re)installation by prebuilt packages.
 .PP
 [BUG FIX] The message format in enumerating port origins or so on was broken.
+.PP
+[MISC] Minor changes are made on HISTORY section of the manual page in the level of coding and terminology.
 .RE
 .TP
 3.0.1 (11 June 2013)