Version 3.0.1+toward_3.0.2_20130705075039

Corrected a bug that the function of avoiding restoration of install conflicts of installed packages were still broken.

	modified:   README
	modified:   bin/portsreinstall
	modified:   lib/libpkgsys.sh
	modified:   lib/libreinstall.sh

diff --git a/README b/README
index 70b0411..e161582 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ================================================================================
  portsreinstall - ports upgrading utility for massive forced reinstallation
-  Version 3.0.0, June 1, 2013
+  Version 3.0.2, July 1, 2013
  Copyright (C) 2010-2013 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 ================================================================================
 

diff --git a/bin/portsreinstall b/bin/portsreinstall
index a507447..59100cc 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.1
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.1+toward_3.0.2_20130704000611
+MYVERSION=3.0.1+toward_3.0.2_20130705075039
 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}

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 11db94a..4ec6cb6 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -923,7 +923,7 @@ pkgsys_get_conflicting_pkgs_patterns ()
                conflicts=$conflicts' '`database_query_get_makevar_val "$origin" CONFLICTS_INSTALL`
                ;;
        esac
-       echo "$conflicts"
+       echo "$conflicts" | sed 's/^ *//;s/ *$//'
 }      
 
 # ============= Get conflicting installed packages of a port =============

diff --git a/lib/libreinstall.sh b/lib/libreinstall.sh
index 99c46c5..ee8e521 100644 (file)
--- a/lib/libreinstall.sh
+++ b/lib/libreinstall.sh
@@ -248,16 +248,14 @@ reinstall_restore_conflicts ()
                [ "x$origin_replace" = "x$origin" ] && origin_replace=
                if pkgsys_chk_conflict_by_a_pkg install "$REINSTALL_ORIGIN" "$pkg"
                then
-                       is_conflicting=yes
                        fileedit_add_a_line_if_new "$pkg:$REINSTALL_NEWPKGNAME" "${DBDIR}/forbidden_conflicts"
+                       continue
                elif reinstall_chk_forbidden_conflicts "$pkg"
                then
                        message_echo "INFO: Restoration of a conflict, $origin ($pkg), is avoided because it conflicts with installed packages."
                        continue
-               else
-                       is_conflicting=no
                fi
-               if [ $is_conflicting = yes -o \( -n "$origin_current" -a "x$origin" = "x$origin_current" \) ] || \
+               if [ -n "$origin_current" -a "x$origin" = "x$origin_current" ] || \
                        pkg_info_e "$pkg" || pkg_info_eO "$origin" || \
                        { [ -n "$origin_orig" ] && pkg_info_eO "$origin_orig"; } || \
                        { [ -n "$origin_replace" ] && pkg_info_eO "$origin_replace"; }