Version 3.0.2+toward_3.0.3_20130731191210

[BUG FIX] Cleaning of distfiles before retrial of failed fetch was forgotten.

	modified:   bin/portsreinstall
	modified:   lib/libreinstall.sh
	modified:   man/portsreinstall.8

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 7ab540b..dcaf00e 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -12,11 +12,11 @@
 # ============ Set up of environment =============
 APPNAME=`basename "$0"`
 
-MYVERSION=3.0.2
-COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
+# MYVERSION=3.0.2
+# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-# MYVERSION=3.0.2+toward_3.0.3_20130710063939
-# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
+MYVERSION=3.0.2+toward_3.0.3_20130731191210
+COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.1_[0-9]+|3\.0\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
 LIBDIR=${MYPREFIX}/lib/${APPNAME}

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 94dc7cb..7a9f0e8 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -697,6 +697,11 @@ reinstall_exec ()
                if reinstall_chk_stage FAILED_FETCH
                then
                        message_echo "INFO: Refetching distfiles for $REINSTALL_ORIGPKGTAG."
+                       if ! reinstall_chk_stage_complete FAILED_FETCH.DISTCLEAN
+                       then
+                               reinstall_make_anymode distclean || :
+                               reinstall_register_stage_complete FAILED_FETCH.DISTCLEAN
+                       fi
                        if ! reinstall_chk_stage_complete FAILED_FETCH.REFETCH
                        then
                                if ! reinstall_make_anymode fetch FETCH_ARGS=-Ap

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index ddcf1f6..e3aff0f 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -2,7 +2,7 @@
 .\" ports reinstall installation guide
 .\" Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
-.TH PORTSREINSTALL 8 "10 July 2013" "FreeBSD" "FreeBSD System Manager's Manual"
+.TH PORTSREINSTALL 8 "10 August 2013" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME
 portsreinstall \- ports upgrading utility for massive forced reinstallation
 .SH SYNOPSIS
@@ -907,6 +907,11 @@ Configuration file of \fBportupgrade\fR(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
+3.0.3 (10 August 2013)
+.RS
+[BUG FIX] Cleaning of distfiles before retrial of failed fetch was forgotten.
+.RE
+.TP
 3.0.2 (10 July 2013)
 .RS
 [NOTE] Version 3.0.1 has a serious defect that newly installed files can be spoiled by restoration of conflicting old packages. When the current version is to executed only for limited ports (with \fB\-q\fR, \fB\-t\fR, \fB\-T\fR or \fB\-O\fR) after this previous version was used, in advance to that, it is strongly encouraged to execute