Changed the implementation related to port option databases internally.

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

diff --git a/lib/libcommand_do.sh b/lib/libcommand_do.sh
index cd8b594..40adf2b 100644 (file)
--- a/lib/libcommand_do.sh
+++ b/lib/libcommand_do.sh
@@ -214,7 +214,7 @@ command_do_reset_changed_portdb ()
        cp /dev/null "$tmp_ls.uninspected.dbfile"
        cp /dev/null "$tmp_ls.uninspected.origin"
        cp /dev/null "$tmp_ls.nonexistent.db"
-       pkgsys_conv_portorigins_to_portoptiondbs < $tmp_ls.diff > $tmp_ls.glob
+       pkgsys_conv_portoptiondbs_to_globs < $tmp_ls.diff > $tmp_ls.glob
        str_escape_replaceval_filter < $tmp_ls.diff > $tmp_ls.diff.rpl
        paste "$tmp_ls.diff" "$tmp_ls.diff.rpl" "$tmp_ls.glob" | while read -r dbfile dbfile_rpl glob
        do

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index b254d05..29a2bc9 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -1671,7 +1671,7 @@ pkgsys_get_current_port_oprions_timestamp ()
 # ============= Get the saved all timestamp information of port options =============
 pkgsys_get_saved_port_oprions_timestamps_all ()
 {
-       cat "${DBDIR}/ls_dbdir/"*.log > $tmp_ls.db 2> /dev/null || :
+       cat "${DBDIR}/ls_dbdir/"*.log 2> /dev/null || :
 }
 
 # ============= Convert a list of port origins to port options timestamp log names =============
@@ -1680,19 +1680,26 @@ pkgsys_conv_portorigin_to_port_oprion_timestamp_logname ()
        sed 's|/|_|'
 }
 
-# ============= Save the timestamp information of port options of a port =============
-pkgsys_save_port_oprion_timestamp ()
+# ============= Get the file name of the port options database of a port =============
+pkgsys_get_port_oprion_database ()
 {
-       local origin portoptlog portoptdb
+       local origin
        origin=$1
-       portoptlog=`echo "$origin" | pkgsys_conv_portorigin_to_port_oprion_timestamp_logname`
        if pkgsys_is_dialog4ports_used
        then
-               portoptdb=`echo "$portoptlog" | sed 's/@.*//'`
+               echo "$origin" | sed 's|/|_|;s/@.*//'
        else
-               portoptdb=`database_build_make "$origin" -V UNIQUENAME`
+               database_build_make "$origin" -V UNIQUENAME
        fi
-       mkdir -p "${DBDIR}/ls_dbdir"
+}
+
+# ============= Save the timestamp information of port options of a port =============
+pkgsys_save_port_oprion_timestamp ()
+{
+       local origin portoptlog portoptdb
+       origin=$1
+       portoptlog=`echo "$origin" | pkgsys_conv_portorigin_to_port_oprion_timestamp_logname`
+       portoptdb=`pkgsys_get_port_oprion_database "$origin"`
        pkgsys_get_current_port_oprions_timestamp "$portoptdb" > ${DBDIR}/ls_dbdir/$portoptlog.log 2> /dev/null || :
 }
 
@@ -1715,17 +1722,17 @@ pkgsys_get_changed_port_oprions ()
        fi
 }
 
-# ============= Convert a list of port origins to port options database names =============
-pkgsys_conv_portorigins_to_portoptiondbs ()
+# ============= Convert a list of port options database names to port globs =============
+pkgsys_conv_portoptiondbs_to_globs ()
 {
        if pkgsys_is_dialog4ports_used
        then
                sed 's|_|/|'
        else
-               cat "$tmp_ls.diff"
+               cat
        fi
 }
-       
+
 # ============= Register nonexistent port options databases =============
 pkgsys_register_list_nonexistent_portopriondb ()
 {