Version 3.2.0+toward_3.2.1_20150120223451

A bug that caused self-conflict of each package is fixed.

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

diff --git a/bin/portsreinstall b/bin/portsreinstall
index ab6bcbb..aea6d4c 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.2.1
 # COMPATIBLE_VERSIONS='^(3\.[1-2]\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.2.0+toward_3.2.1_20150120205620
+MYVERSION=3.2.0+toward_3.2.1_20150120223451
 COMPATIBLE_VERSIONS='^(3\.[1-2]\.[0-9]+\+toward_3\.[1-2]\.[0-9]+_[0-9]+|3\.[1-2]\.[0-9]+)$'
 MYPREFIX=`dirname "\`dirname \"$0\"\`" | sed 's|/bin$||'`
 MYPREFIX=${MYPREFIX:-/usr/local}

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index d605f90..fee6984 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -1020,12 +1020,16 @@ reinstall_exec ()
                cat "${DBDIR}/backup_pkgarcs.lst" 2> /dev/null \
                        | while read origin_bak pkgpath_bak
                do
-                       if pkgsys_chk_match_to_restored_files_by_backup_pkg "$origin_bak" "${TMPDIR}/previously_installed_files.grep_pattern"
+                       pkg_bak=`pkgsys_pkgarc_to_pkgname "$pkgpath_bak"`
+                       if [ "$origin_bak" = "$REINSTALL_ORIGIN" ]
                        then
-                               pkg_bak=`pkgsys_pkgarc_to_pkgname "$pkgpath_bak"`
-                               fileedit_add_a_line_if_new "$pkg_bak:$REINSTALL_NEWPKGNAME" \
-                                       "${DBDIR}/forbidden_conflicts"
+                               [ "$pkg_bak" = "$REINSTALL_NEWPKGNAME" ] && continue
+                       elif ! pkgsys_chk_match_to_restored_files_by_backup_pkg "$origin_bak" "${TMPDIR}/previously_installed_files.grep_pattern"
+                       then
+                               continue
                        fi
+                       fileedit_add_a_line_if_new "$pkg_bak:$REINSTALL_NEWPKGNAME" \
+                               "${DBDIR}/forbidden_conflicts"
                done
                reinstall_register_stage_complete UPDATE_CONFLICTS
        fi

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 569b1a3..bb5d3b5 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -1,8 +1,8 @@
 .\" ==================================================================================
 .\" ports reinstall installation guide
-.\" Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
+.\" Copyright (C) 2010-2015 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
-.TH PORTSREINSTALL 8 "30 December 2014" "FreeBSD" "FreeBSD System Manager's Manual"
+.TH PORTSREINSTALL 8 "30 January 2015" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME
 portsreinstall \- ports upgrading utility for massive forced reinstallation
 .SH SYNOPSIS