Changes to be committed:
modified: lib/libfs.sh
modified: lib/libmain.sh
modified: lib/libpkgsys.sh
modified: lib/libreinstall.sh
fs_fix_unionfs_image_if_hidden ()
{
local needlepath needlepath_next
- needlepath="$1"
+ needlepath=$1
while :
do
find -dx "$needlepath" -maxdepth 0 > /dev/null 2>&1 || :
MYVERSION=4.0.1
COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
# Template for development versions
- MYVERSION=4.0.0+toward_4.0.1_20180710120655
+ MYVERSION=4.0.0+toward_4.0.1_20180710231919
COMPATIBLE_VERSIONS='^(4\.[0]\.[0]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
}
pkgsys_chk_ports_tree_implementation ()
{
local var tmp_work
+ fs_fix_unionfs_image_if_hidden "${PORTSDIR}/Mk/bsd.port.mk"
if [ ! -d "${PORTSDIR}" ]
then
message_echo "ERROR: Ports directory ${PORTSDIR} is not found." >&2
else
is_skipped=no
fi
- if [ "$is_skipped" = yes ]
+ if [ $is_skipped = yes ]
then
message_echo "INFO: Restoration of a conflict, $origin ($pkg), is avoided because it conflicts with installed packages."
fi