Additional corrections related to the previous one.

 Changes to be committed:
	modified:   lib/libmain.sh
	modified:   lib/libpkgsys.sh
	modified:   lib/upgrade/libcommand_do.sh

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 73a4243..572d264 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.0.1
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.0.1_20180715163336
+       MYVERSION=4.0.0+toward_4.0.1_20180715175555
        COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 3aacef8..c83ec6f 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -946,6 +946,21 @@ pkgsys_get_installed_pkg_from_origin ()
        :
 }
 
+# ============= Get the installed package name from glob patterns =============
+pkgsys_get_installed_pkg_from_glob ()
+{
+       local glob regexp
+       for glob in "$@"
+       do
+               if regexp=`expr "$glob" : ':\(.*\)'`
+               then
+                       pkg_info_Ex "$regexp"
+               else
+                       pkg_info_Eg "$glob"
+               fi
+       done | sort -u
+}
+
 # ============= Check existence of an installed package for a flavored origin =============
 pkgsys_exists_from_orig ()
 {
@@ -1401,7 +1416,7 @@ pkgsys_get_conflicting_installed_pkgs ()
        tmp_conflicts=${TMPDIR}/pkgsys_get_conflicting_installed_pkgs::conflicts
        pkgsys_get_conflicting_pkgs_patterns "$mode" "$origin" | while read pkg_pattern
        do
-               pkg_info_Eg "$pkg_pattern" || :
+               pkgsys_get_installed_pkg_from_glob "$pkg_pattern" || :
        done > $tmp_conflicts
        cat "$tmp_conflicts"
        [ `wc -l < $tmp_conflicts` -gt 0 ]

diff --git a/lib/upgrade/libcommand_do.sh b/lib/upgrade/libcommand_do.sh
index c1f6901..f40c3fc 100644 (file)
--- a/lib/upgrade/libcommand_do.sh
+++ b/lib/upgrade/libcommand_do.sh
@@ -98,7 +98,7 @@ command_do_reinst_ports ()
                                ;;
                        delete_pattern )
                                pkg_pattern=$argument
-                               pkg_info_Eg "$pkg_pattern" | while read pkgname
+                               pkgsys_get_installed_pkg_from_glob "$pkg_pattern" | while read pkgname
                                do
                                        if [ $opt_dry_run = yes ]
                                        then
@@ -134,7 +134,7 @@ command_do_reinst_ports ()
                                        echo "$conflict" | while read -r pkg_pattern
                                        do
                                                [ -n "$pkg_pattern" ] || continue
-                                               pkg_info_Eg "$pkg_pattern" || :
+                                               pkgsys_get_installed_pkg_from_glob "$pkg_pattern" || :
                                        done
                                        pkgsys_get_installed_pkg_from_origin "$origin"
                                } | sort -u`