[BUG FIX] The file name given by save command was with a wrong time stamp.

Bump to release version 2.0.0.

	modified:   portsreinstall
	modified:   portsreinstall.8
	modified:   portsreinstall.8~
	modified:   portsreinstall~

diff --git a/portsreinstall b/portsreinstall
index 40d5cdc..36c932c 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=1.1.0+toward_2.0.0_20120810132451
+MYVERSION=2.0.0
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -1164,13 +1164,13 @@ taboo)
 save)
 echo $*
        chk_privilege
-       [ -d "${DBDIR}" ] || { echo "ERROR: Database has not built yet." >&2; exit 1; }
+       [ -d "${DBDIR}" ] || { echo "ERROR: Database has not been built up yet." >&2; exit 1; }
        savedir=$1
        [ -n "$savedir" ] || { echo "ERROR: Directory to save the temporal database archive is not specified." >&2; exit 1; }
        [ -d "$savedir" ] || { echo "ERROR: Directory [$savedir] is not found." >&2; exit 1; }
        srcdir=`dirname "${DBDIR}"`
        srcnode=`basename "${DBDIR}"`
-       savefile=`realpath "$savedir"`/${APPNAME}_`date +%S%m%d_%H%M%S`.tar.gz
+       savefile=`realpath "$savedir"`/${APPNAME}_`date +%Y%m%d_%H%M%S`.tar.gz
        echo "Starting to save the temporal database as [$savefile]..."
        ( cd "$srcdir" && tar czf "$savefile" "$srcnode" )
        echo "Done"
@@ -1910,7 +1910,7 @@ fi
 # Order the ports considering dependencies
 if [ ! -e "${DBDIR}/COMPLETE_ORDERED_ALL_DEPENDENCIES" ]
 then
-       echo "Starting order of dependencies at `timestamp`"
+       echo "Starting ordering of dependencies at `timestamp`"
        [ ! -f "${DBDIR}/reinst_order.list.tmp" ] || echo "INFO: Restarting from the previously terminated point"
        touch "${DBDIR}/reinst_order.list.tmp"
        cd "${DBDIR}/requires"

diff --git a/portsreinstall.8 b/portsreinstall.8
index 297a6b4..825be14 100644 (file)
--- a/portsreinstall.8
+++ b/portsreinstall.8
@@ -275,7 +275,7 @@ Configuration file of portupgrade(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
-2.0.0 (8 August 2012)
+2.0.0 (12 August 2012)
 [NEW] Options \fB\-X\fR, \fB\-r\fR and \fB\-R\fR are added so as to compensate a fact that \fB\-x\fR, \fB\-t\fR and \fB\-T\fR cannot specify package names with commas.
 
 [NEW] Commands of \fBshow requirements\fR and  \fBshow dependents\fR are added.
@@ -297,6 +297,8 @@ Configuration file of portupgrade(1).
 [BUG FIX] Termination message is corrected (portsreinstall ok => portsreinstall ok add).
 
 [BUG FIX] Values of BEFOREBUILD, BEFOREDEINSTALL and AFTERINSTALL were not correctly imported from pkgtools.conf(5).
+
+[BUG FIX] The file name given by save command was with a wrong time stamp.
 .TP
 1.1.0 (28 April 2012)
 [NEW] Command of show deleted is newly added.

diff --git a/portsreinstall.8~ b/portsreinstall.8~
index b4b0700..5163631 100644 (file)
--- a/portsreinstall.8~
+++ b/portsreinstall.8~
@@ -275,7 +275,7 @@ Configuration file of portupgrade(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
-2.0.0 (8 August 2012)
+2.0.0 (11 August 2012)
 [NEW] Options \fB\-X\fR, \fB\-r\fR and \fB\-R\fR are added so as to compensate a fact that \fB\-x\fR, \fB\-t\fR and \fB\-T\fR cannot specify package names with commas.
 
 [NEW] Commands of \fBshow requirements\fR and  \fBshow dependents\fR are added.
@@ -292,11 +292,13 @@ Configuration file of portupgrade(1).
 
 [CHANGED] The specification of \fBshow\fR command is changed to exclude irrelevant packages/ports and output messages about the matching targets when options \fB\-r\fR, \fB\-R\fR, \fB\-t\fR and \fB\-T\fR are enabled.
 
-[CHANGED] The default behavior in case that the temporal database is older than the ports tree is changed from warnings to automatic reconstruction.
+[CHANGED] The default behavior in case that the temporal database is older than the ports tree is changed from warnings to automatic reconstruction; the old behavior is recovered by option \fB\-c\fR.
 
 [BUG FIX] Termination message is corrected (portsreinstall ok => portsreinstall ok add).
 
 [BUG FIX] Values of BEFOREBUILD, BEFOREDEINSTALL and AFTERINSTALL were not correctly imported from pkgtools.conf(5).
+
+[BUG FIX] The file name given by save command was with a wrong time stamp.
 .TP
 1.1.0 (28 April 2012)
 [NEW] Command of show deleted is newly added.

diff --git a/portsreinstall~ b/portsreinstall~
index 6f201fc..8bedbc7 100755 (executable)
--- a/portsreinstall~
+++ b/portsreinstall~
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=1.1.0+toward_2.0.0_20120810130509
+MYVERSION=1.1.0+toward_2.0.0_20120811170759
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -1164,13 +1164,13 @@ taboo)
 save)
 echo $*
        chk_privilege
-       [ -d "${DBDIR}" ] || { echo "ERROR: Database has not built yet." >&2; exit 1; }
+       [ -d "${DBDIR}" ] || { echo "ERROR: Database has not been built up yet." >&2; exit 1; }
        savedir=$1
        [ -n "$savedir" ] || { echo "ERROR: Directory to save the temporal database archive is not specified." >&2; exit 1; }
        [ -d "$savedir" ] || { echo "ERROR: Directory [$savedir] is not found." >&2; exit 1; }
        srcdir=`dirname "${DBDIR}"`
        srcnode=`basename "${DBDIR}"`
-       savefile=`realpath "$savedir"`/${APPNAME}_`date +%S%m%d_%H%M%S`.tar.gz
+       savefile=`realpath "$savedir"`/${APPNAME}_`date +%Y%m%d_%H%M%S`.tar.gz
        echo "Starting to save the temporal database as [$savefile]..."
        ( cd "$srcdir" && tar czf "$savefile" "$srcnode" )
        echo "Done"
@@ -1910,7 +1910,7 @@ fi
 # Order the ports considering dependencies
 if [ ! -e "${DBDIR}/COMPLETE_ORDERED_ALL_DEPENDENCIES" ]
 then
-       echo "Starting order of dependencies at `timestamp`"
+       echo "Starting ordering of dependencies at `timestamp`"
        [ ! -f "${DBDIR}/reinst_order.list.tmp" ] || echo "INFO: Restarting from the previously terminated point"
        touch "${DBDIR}/reinst_order.list.tmp"
        cd "${DBDIR}/requires"