This is for active development.
New funtionalities are to be added actively.
| Revision | 9b4058a6a44d5716d724c73a2e93f7f95f099820 (tree) |
|---|---|
| Time | 2018-09-11 21:55:12 |
| Author | Mamoru Sakaue / MwGhennndo <glmwghennndo@user...> |
| Commiter | Mamoru Sakaue / MwGhennndo |
Fixed bugs about command_do_update_host_files().
modified: lib/chroot/libcommand_do.sh
modified: lib/libcommand_pkgs.sh
modified: lib/libmain.sh
lib/chroot/libcommand_do.sh (diff) lib/libcommand_pkgs.sh (diff) lib/libmain.sh (diff)| @@ -118,6 +118,7 @@ command_do_chroot_enter () | ||
| 118 | 118 | command_do_update_host_files () |
| 119 | 119 | { |
| 120 | 120 | local dirpath filepath |
| 121 | + [ "x$opt_share_port_pkgs_dirs" = xyes ] && return | |
| 121 | 122 | message_section_title "Update the files affecting package installation of the host environment" |
| 122 | 123 | message_echo "INFO: targets are packages, distfiles, port options and ports/packages management tools configurations" |
| 123 | 124 | for dirpath in "${DISTDIR}" "${PACKAGES}" "${PORT_DBDIR}" |
| @@ -138,7 +139,7 @@ command_do_update_host_files () | ||
| 138 | 139 | mkdir -p "$nodedir" |
| 139 | 140 | cp -p "$opt_basedir/builder$dirpath/$file" "$dirpath/$file" |
| 140 | 141 | done |
| 141 | - find -d $dirpath -type d -empty -delete | |
| 142 | + find -d $dirpath -mindepth 1 -type d -empty -delete | |
| 142 | 143 | done |
| 143 | 144 | for filepath in "${LOCALBASE}"/etc/portsreinstall.conf "${LOCALBASE}"/etc/pkgtools.conf "${LOCALBASE}"/etc/pkg.conf /etc/make.conf "${DBDIR}" |
| 144 | 145 | do |
| @@ -303,9 +303,14 @@ command_pkgs_packupgrade_create__manifest_reinst () | ||
| 303 | 303 | then |
| 304 | 304 | if pkg_info_e "$pkgname" |
| 305 | 305 | then |
| 306 | - pkgarc=`pkgsys_pkgname_to_pkgarc "${PACKAGESDIR}" "$pkgname"` | |
| 307 | - timestamp_inst=`pkg_get_pkg_timestamp "$pkgname" 2> /dev/null` || : | |
| 308 | - timestamp_arc=`ls -lD %s "$pkgarc" 2> /dev/null | sed -E 's/[[:space:]]+/ /g' | cut -w -f 6 | grep -v '^$'` || : | |
| 306 | + if pkgarc=`pkgsys_pkgname_to_pkgarc "${PACKAGESDIR}" "$pkgname"` | |
| 307 | + then | |
| 308 | + timestamp_inst=`pkg_get_pkg_timestamp "$pkgname" 2> /dev/null` || : | |
| 309 | + timestamp_arc=`ls -lD %s "$pkgarc" 2> /dev/null | sed -E 's/[[:space:]]+/ /g' | cut -w -f 6 | grep -v '^$'` || : | |
| 310 | + else | |
| 311 | + timestamp_inst=1 | |
| 312 | + timestamp_arc=0 | |
| 313 | + fi | |
| 309 | 314 | if [ -z "$timestamp_inst" -o -z "$timestamp_arc" -o "$timestamp_arc" -lt "$timestamp_inst" ] |
| 310 | 315 | then |
| 311 | 316 | if ! ( cd ${PACKAGESDIR}; pkg_create_b "$pkgname" | message_cat ) |
| @@ -12,7 +12,7 @@ main_set_version () | ||
| 12 | 12 | MYVERSION=4.1.0 |
| 13 | 13 | COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$' |
| 14 | 14 | # Template for development versions |
| 15 | - MYVERSION=4.0.0+toward_4.1.0_20180911163139 | |
| 15 | + MYVERSION=4.0.0+toward_4.1.0_20180911205455 | |
| 16 | 16 | COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$' |
| 17 | 17 | } |
| 18 | 18 |
Fork