[BUG FIX] Breset command discarded the information of the initially installed packages.

 Changes to be committed:
	modified:   lib/libdatabase_maintain.sh
	modified:   lib/libmain.sh
	modified:   man/portsreinstall.8

diff --git a/lib/libdatabase_maintain.sh b/lib/libdatabase_maintain.sh
index 05fa2ee..5ee2453 100644 (file)
--- a/lib/libdatabase_maintain.sh
+++ b/lib/libdatabase_maintain.sh
@@ -154,8 +154,8 @@ database_maintain_reset ()
        else
                rm -rf "${DBDIR}"/requires.prev "${DBDIR}"/notes.prev
        fi
-       find "${DBDIR}" -depth 1 \
-               -not \( -name saved_options.sh \
+       find "${DBDIR}" -depth 1 -maxdepth 1 \
+               -not \( -name saved_options.sh -or -name initial \
                        -or -name MYVERSION -or -name .lock \
                        -or -name journal -or -name prevset \
                        -or -name backup_failure -or -name installed_ports \) \

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 8ed592a..850923f 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.0.1
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.0.1_20180717153350
+       MYVERSION=4.0.0+toward_4.0.1_20180717230443
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 1a325d9..996cad4 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -1091,7 +1091,9 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [IMPROVED] It is changed to unlock in all error termination.
 .PP
-[BUG FIX] Dependency inspection terminated with error when obsolete ports exist.
+[BUG FIX] \fBreset\fR command discarded the information of the initially installed packages.
+.PP
+[BUG FIX] Dependency inspection might have terminated with error when obsolete ports exist.
 .PP
 [BUG FIX] Changes made by commands or in ${LOCALBASE}/etc/portsreinstall.conf were not reflected to dependents of the specified ports in the redo runs with incorrect messages notifying as already inspected merged ports.
 .PP