Fixed bugs about command_do_update_host_files().

 Changes to be committed:
	modified:   lib/chroot/libcommand_do.sh
	modified:   lib/libcommand_pkgs.sh
	modified:   lib/libmain.sh

diff --git a/lib/chroot/libcommand_do.sh b/lib/chroot/libcommand_do.sh
index bf283c3..9a49de4 100644 (file)
--- a/lib/chroot/libcommand_do.sh
+++ b/lib/chroot/libcommand_do.sh
@@ -118,6 +118,7 @@ command_do_chroot_enter ()
 command_do_update_host_files ()
 {
        local dirpath filepath
+       [ "x$opt_share_port_pkgs_dirs" = xyes ] && return
        message_section_title "Update the files affecting package installation of the host environment"
        message_echo "INFO: targets are packages, distfiles, port options and ports/packages management tools configurations"
        for dirpath in "${DISTDIR}" "${PACKAGES}" "${PORT_DBDIR}"
@@ -138,7 +139,7 @@ command_do_update_host_files ()
                        mkdir -p "$nodedir"
                        cp -p "$opt_basedir/builder$dirpath/$file" "$dirpath/$file"
                done
-               find -d $dirpath -type d -empty -delete
+               find -d $dirpath -mindepth 1 -type d -empty -delete
        done
        for filepath in "${LOCALBASE}"/etc/portsreinstall.conf "${LOCALBASE}"/etc/pkgtools.conf "${LOCALBASE}"/etc/pkg.conf /etc/make.conf "${DBDIR}"
        do

diff --git a/lib/libcommand_pkgs.sh b/lib/libcommand_pkgs.sh
index e1b0bd4..448fe4b 100644 (file)
--- a/lib/libcommand_pkgs.sh
+++ b/lib/libcommand_pkgs.sh
@@ -303,9 +303,14 @@ command_pkgs_packupgrade_create__manifest_reinst ()
                then
                        if pkg_info_e "$pkgname"
                        then
-                               pkgarc=`pkgsys_pkgname_to_pkgarc "${PACKAGESDIR}" "$pkgname"`
-                               timestamp_inst=`pkg_get_pkg_timestamp "$pkgname" 2> /dev/null` || :
-                               timestamp_arc=`ls -lD %s "$pkgarc" 2> /dev/null | sed -E 's/[[:space:]]+/ /g' | cut -w -f 6 | grep -v '^$'` || :
+                               if pkgarc=`pkgsys_pkgname_to_pkgarc "${PACKAGESDIR}" "$pkgname"`
+                               then
+                                       timestamp_inst=`pkg_get_pkg_timestamp "$pkgname" 2> /dev/null` || :
+                                       timestamp_arc=`ls -lD %s "$pkgarc" 2> /dev/null | sed -E 's/[[:space:]]+/ /g' | cut -w -f 6 | grep -v '^$'` || :
+                               else
+                                       timestamp_inst=1
+                                       timestamp_arc=0
+                               fi
                                if [ -z "$timestamp_inst" -o -z "$timestamp_arc" -o "$timestamp_arc" -lt "$timestamp_inst" ]
                                then
                                        if ! ( cd ${PACKAGESDIR}; pkg_create_b "$pkgname" | message_cat )

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 2335c4c..fc1ca3f 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180911163139
+       MYVERSION=4.0.0+toward_4.1.0_20180911205455
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }