[BUG FIX] Minor inappropriate messages and actions emerged when the target and replac...

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

diff --git a/portsreinstall b/portsreinstall
index 5e92862..1a754ca 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.1.0+toward_2.1.1_20121215202845
+MYVERSION=2.1.0+toward_2.1.1_20121215212928
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -905,22 +905,25 @@ inspect_dependencies ()
        then
                origin_src=$origin
                origin=`echo $origin_src | sed -E -f "${DBDIR}/REPLACE.replace_pattern.conflist"`
-               if [ $is_supressed = yes ]
+               if [ "x$origin_src" != "x$origin" ]
                then
-                       if [ -n "$origin" ]
+                       if [ $is_supressed = yes ]
                        then
-                               echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration (ignored)"
-                       else
-                               echo "${DEPTH_INDEX}  ===> Deleted by user configuration (ignored)"
-                       fi
-               else
-                       add_to_obsolete_if_not_yet "$origin_src"
-                       if [ -n "$origin" ]
-                       then
-                               add_a_line_if_new "$origin" "${DBDIR}/replaced_target.inspected.list"
-                               echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration"
+                               if [ -n "$origin" ]
+                               then
+                                       echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration (ignored)"
+                               else
+                                       echo "${DEPTH_INDEX}  ===> Deleted by user configuration (ignored)"
+                               fi
                        else
-                               echo "${DEPTH_INDEX}  ===> Deleted by user configuration"
+                               add_to_obsolete_if_not_yet "$origin_src"
+                               if [ -n "$origin" ]
+                               then
+                                       add_a_line_if_new "$origin" "${DBDIR}/replaced_target.inspected.list"
+                                       echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration"
+                               else
+                                       echo "${DEPTH_INDEX}  ===> Deleted by user configuration"
+                               fi
                        fi
                fi
        fi

diff --git a/portsreinstall.8 b/portsreinstall.8
index bb52343..fec1ae2 100644 (file)
--- a/portsreinstall.8
+++ b/portsreinstall.8
@@ -286,7 +286,9 @@ Configuration file of portupgrade(1).
 2.1.1 (15 December 2012)
 [CHANGED] The default settings in portsreinstall.conf was changed so as to include a HOLD pattern for bsdpan.
 
-[BUG FIX] There was a problem in evaluating globs patterns of origins.
+[BUG FIX] There was a problem in evaluating glob patterns expressing origins.
+
+[BUG FIX] Minor inappropriate messages and actions emerged when the target and replacement of ports substitution become the same.
 .TP
 2.1.0 (10 December 2012)
 [NEW] New generation package (pkgng) is supported.

diff --git a/portsreinstall.8~ b/portsreinstall.8~
index f6d1804..dc35078 100644 (file)
--- a/portsreinstall.8~
+++ b/portsreinstall.8~
@@ -284,7 +284,11 @@ Configuration file of portupgrade(1).
 \fBportsreinstall\fR has been developed as below.
 .TP
 2.1.1 (15 December 2012)
-[BUG FIX] There was a problem in evaluating globs patterns of origins.
+[CHANGED] The default settings in portsreinstall.conf was changed so as to include a HOLD pattern for bsdpan.
+
+[BUG FIX] There was a problem in evaluating glob patterns expressing origins.
+
+[BUG FIX] Minor inappropriate messages and actions emerged when the target and alternative of replacement become the same.
 .TP
 2.1.0 (10 December 2012)
 [NEW] New generation package (pkgng) is supported.

diff --git a/portsreinstall~ b/portsreinstall~
index 69f2bdf..e090da4 100755 (executable)
--- a/portsreinstall~
+++ b/portsreinstall~
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.1.0+toward_2.1.1_20121215201602
+MYVERSION=2.1.0+toward_2.1.1_20121215202845
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -905,22 +905,25 @@ inspect_dependencies ()
        then
                origin_src=$origin
                origin=`echo $origin_src | sed -E -f "${DBDIR}/REPLACE.replace_pattern.conflist"`
-               if [ $is_supressed = yes ]
+               if [ "x$origin_src" != "x$origin" ]
                then
-                       if [ -n "$origin" ]
+                       if [ $is_supressed = yes ]
                        then
-                               echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration (ignored)"
-                       else
-                               echo "${DEPTH_INDEX}  ===> Deleted by user configuration (ignored)"
-                       fi
-               else
-                       add_to_obsolete_if_not_yet "$origin_src"
-                       if [ -n "$origin" ]
-                       then
-                               add_a_line_if_new "$origin" "${DBDIR}/replaced_target.inspected.list"
-                               echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration"
+                               if [ -n "$origin" ]
+                               then
+                                       echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration (ignored)"
+                               else
+                                       echo "${DEPTH_INDEX}  ===> Deleted by user configuration (ignored)"
+                               fi
                        else
-                               echo "${DEPTH_INDEX}  ===> Deleted by user configuration"
+                               add_to_obsolete_if_not_yet "$origin_src"
+                               if [ -n "$origin" ]
+                               then
+                                       add_a_line_if_new "$origin" "${DBDIR}/replaced_target.inspected.list"
+                                       echo "${DEPTH_INDEX}  ===> Replaced with $origin by user configuration"
+                               else
+                                       echo "${DEPTH_INDEX}  ===> Deleted by user configuration"
+                               fi
                        fi
                fi
        fi