Version 3.0.5+toward_3.1.0_20140708035940

The specifications of the temporary database is changed to fix bugs.

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

diff --git a/README b/README
index d7109f3..cb5eae6 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ================================================================================
  portsreinstall - ports upgrading utility for massive forced reinstallation
-  Version 3.0.6, July 7, 2014
+  Version 3.1.0, July 7, 2014
  Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 ================================================================================
 

diff --git a/bin/portsreinstall b/bin/portsreinstall
index 6a00d65..113dee0 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -12,11 +12,11 @@
 # ============ Set up of environment =============
 APPNAME=`basename "$0"`
 
-# MYVERSION=3.0.6
-# COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
+# MYVERSION=3.1.0
+# COMPATIBLE_VERSIONS='^(3\.1\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.5+toward_3.0.6_20140707112659
-COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.0\.[0-9]+)$'
+MYVERSION=3.0.5+toward_3.1.0_20140708035940
+COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.1\.[0-9]+_[0-9]+|3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[0-9]+|3\.1\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}
 LIBDIR=${MYPREFIX}/lib/${APPNAME}
@@ -692,12 +692,16 @@ _program_exec_and_record_completion__operation ()
        for tag in all run build
        do
                ( cd "${DBDIR}/requires" && \
-                       find . -depth 3 -type f -name requirements.${tag}.full | sed 's|^./||;s|/[^/]*$||' ) \
+                       find . -depth 3 -type f -name requirements.${tag}.full -or -name requirements.${tag}.full.orig ) \
+                       | sort -u \
+                       | sed 's|^./||;s|/[^/]*$||' \
                        | grep -v -E -f "${DBDIR}/update_dependencies.grep_pattern" \
                        | str_escape_regexp_filter | sed 's/^/^/; s/$/$/' \
                        > ${TMPDIR}/convert_requirements_list:full_complete.grep_pattern || :
                ( cd "${DBDIR}/requires" && \
-                       find . -depth 3 -type f -name requirements.${tag}.direct | sed 's|^./||;s|/[^/]*$||' ) \
+                       find . -depth 3 -type f -name requirements.${tag}.direct -or -name requirements.${tag}.direct.orig ) \
+                       | sort -u \
+                       | sed 's|^./||;s|/[^/]*$||'
                        | grep -v -E -f "${TMPDIR}/convert_requirements_list:full_complete.grep_pattern" \
                        > ${DBDIR}/stage.loop_list/complete_recursive_${tag}time_reqlists || :
        done

diff --git a/lib/libdatabase_build.sh b/lib/libdatabase_build.sh
index 077f10c..74f8391 100644 (file)
--- a/lib/libdatabase_build.sh
+++ b/lib/libdatabase_build.sh
@@ -854,6 +854,7 @@ _database_build_reset_a_port_confdb ()
                        for tabel in requirements dependents
                        do
                                cat "${DBDIR}/$dbtag/$origin/$tabel.all.full" 2> /dev/null || :
+                               cat "${DBDIR}/$dbtag/$origin/$tabel.all.full.orig" 2> /dev/null || :
                                rm -f "${DBDIR}/$dbtag/$origin/$tabel.run.full" \
                                        "${DBDIR}/$dbtag/$origin/$tabel.build.full" \
                                        "${DBDIR}/$dbtag/$origin/is_customized" 2> /dev/null

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index ad177db..c3336b0 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -470,6 +470,7 @@ reinstall_tell_update_to_depandents ()
                                | sort -u \
                                | while read origin_dependent
                        do
+                               [ -d "${DBDIR}/requires/$origin_dependent" ] || continue
                                touch "${DBDIR}/requires/$origin_dependent/need_reinstall_due_to_upgraded_requirements.$dbsuffix"
                                fileedit_rm_a_line "$origin_dependent" \
                                        "${DBDIR}/success.$dbsuffix.list"

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index fb52409..71c88f9 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -912,7 +912,7 @@ Configuration file of \fBportupgrade\fR(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
-3.0.6 (07 July 2014)
+3.1.0 (07 July 2014)
 .RS
 [BUG FIX] Command \fBprepare\fR was possibly aborted at a port any of whose requirements or dependents is obsolete.
 .PP