Version 3.0.5+toward_3.0.6_20140604053559

[BUG FIX] Evaluation of glob was incorrect when the pattern is regular expression containing multiple slashes.

	modified:   README
	modified:   bin/portsreinstall
	modified:   lib/libpkgsys.sh
	modified:   man/portsreinstall.8

diff --git a/README b/README
index 58334bb..f304393 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ================================================================================
  portsreinstall - ports upgrading utility for massive forced reinstallation
-  Version 3.0.6, June 2, 2014
+  Version 3.0.6, June 4, 2014
  Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 ================================================================================
 

diff --git a/bin/portsreinstall b/bin/portsreinstall
index e7bc4a2..8020c27 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -15,7 +15,7 @@ APPNAME=`basename "$0"`
 # MYVERSION=3.0.6
 # COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+)$'
 # Template for development versions
-MYVERSION=3.0.5+toward_3.0.6_20140602102433
+MYVERSION=3.0.5+toward_3.0.6_20140604053559
 COMPATIBLE_VERSIONS='^(3\.0\.[0-9]+\+toward_3\.0\.[0-9]+_[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 77487d3..06728a2 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -780,7 +780,7 @@ pkgsys_eval_ports_glob ()
                shift
                expr "x$glob" : '^x-' > /dev/null 2>&1 && continue
                glob_regexp=`str_convert_portsglob_to_regexp_pattern "$glob"`
-               if expr "$glob" : '[^/][^/]*\/[^/][^/]*$' > /dev/null 2>&1
+               if expr "$glob" : '.*/' > /dev/null 2>&1
                then
                        grep -E "$glob_regexp" "$origlist" 2>&1 || :
                        {
@@ -805,6 +805,31 @@ pkgsys_eval_ports_glob ()
                                | cut -f 2
                        pkg_info_qoX "$glob_regexp" || :
                fi
+#              if expr "$glob" : '[^/][^/]*\/[^/][^/]*$' > /dev/null 2>&1
+#              then
+#                      grep -E "$glob_regexp" "$origlist" 2>&1 || :
+#                      {
+#                              pkg_info_qoa
+#                              cut -f 2 "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null
+#                      } | grep -E "$glob_regexp" 2>&1 || :
+#              else
+#                      if expr "$glob" : '^[a-z][a-zA-Z0-9+-]*[a-zA-Z0-9+]$' > /dev/null 2>&1 && \
+#                              [ `expr "$glob" : '.*-[0-9]' 2>&1` -eq 0 ]
+#                      then
+#                              glob_regexp2=`expr "$glob_regexp" : '\(.*\)\$$' 2>&1`'-[0-9]'
+#                      else
+#                              glob_regexp2=$glob_regexp
+#                      fi
+#                      grep -n -E "$glob_regexp2" "$pkglist" 2>&1 | cut -d : -f 1 \
+#                              | while read index
+#                      do
+#                              sed -n ${index}p "$origlist"
+#                      done || :
+#                      glob_regexp2=`expr "$glob_regexp" : '\(.*\)\$$' 2>&1`'[[:space:]]'
+#                      { sed -n -E "/$glob_regexp2/p" "${DBDIR}/installed_ports:pkg_vs_origin.tbl" 2> /dev/null || :; } \
+#                              | cut -f 2
+#                      pkg_info_qoX "$glob_regexp" || :
+#              fi
        done | sort -u
 }
 

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index dd5cf98..ace54a2 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -2,7 +2,7 @@
 .\" ports reinstall installation guide
 .\" Copyright (C) 2010-2014 Mamoru Sakaue, MwGhennndo, All Rights Reserved.
 .\" ==================================================================================
-.TH PORTSREINSTALL 8 "2 June 2014" "FreeBSD" "FreeBSD System Manager's Manual"
+.TH PORTSREINSTALL 8 "4 June 2014" "FreeBSD" "FreeBSD System Manager's Manual"
 .SH NAME
 portsreinstall \- ports upgrading utility for massive forced reinstallation
 .SH SYNOPSIS
@@ -912,7 +912,7 @@ Configuration file of \fBportupgrade\fR(1).
 .SH HISTORY
 \fBportsreinstall\fR has been developed as below.
 .TP
-3.0.6 (02 June 2014)
+3.0.6 (04 June 2014)
 .RS
 [BUG FIX] Command \fBprepare\fR was possibly aborted at a port any of whose requirements or dependents is obsolete.
 .PP
@@ -929,6 +929,8 @@ Configuration file of \fBportupgrade\fR(1).
 [BUG FIX] Reload of configuration where replacement rule is changed possibly caused errors in the phase of "Inspection of necessity".
 .PP
 [BUG FIX] Messages about failed ports were inappropriate when failed ports were changed to unneeded.
+.PP
+[BUG FIX] Evaluation of glob was incorrect when the pattern is regular expression containing multiple slashes.
 .RE
 .TP
 3.0.5 (14 December 2013)