Changes to be committed:
modified: lib/libcommand_do.sh
modified: lib/libdatabase_query.sh
modified: lib/libmain.sh
modified: lib/libreinstall.sh
do
dbpath_requirement=${DBDIR}/requires/$origin_requirement
[ -e "$dbpath_requirement/necessary_upgrade.build.${level}" ] || continue
do
dbpath_requirement=${DBDIR}/requires/$origin_requirement
[ -e "$dbpath_requirement/necessary_upgrade.build.${level}" ] || continue
+ [ `cat "${DBDIR}/moved_from/$origin_requirement/current_version" 2> /dev/null | wc -l` -eq 0 ] || return 0
touch "$dbpath_requirement/necessary_upgrade.run.${level}"
done < $dbpath/requirements.build.${level}
:
touch "$dbpath_requirement/necessary_upgrade.run.${level}"
done < $dbpath/requirements.build.${level}
:
[ -n "$put_blankline" ] && message_echo
while read origin
do
[ -n "$put_blankline" ] && message_echo
while read origin
do
- [ -n "$flag_negative_listdb" ] && grep -Fx "$origin" "${DBDIR}/$flag_negative_listdb" 2> /dev/null && continue
+ matches=no
+ for negative_listdb in $flag_negative_listdb
+ do
+ if grep -qFx "$origin" "${DBDIR}/$negative_listdb" 2> /dev/null
+ then
+ matches=yes
+ break
+ fi
+ done
+ [ $matches = no ] && continue
if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
then
if [ -n "$flag_filter_skip_unchanged" -a $opt_skip_unchanged = yes ]
then
for flag in $flag_filter_skip_unchanged
do
if [ -e "${DBDIR}/requires/$origin/$flag" ]
for flag in $flag_filter_skip_unchanged
do
if [ -e "${DBDIR}/requires/$origin/$flag" ]
list=todo_after_requirements_succeed.$dbsuffix.list
flag_filter_skip_unchanged="necessary_upgrade.$dbsuffix necessary_upgrade_completed.$dbsuffix"
flag_filter_only_target=y
list=todo_after_requirements_succeed.$dbsuffix.list
flag_filter_skip_unchanged="necessary_upgrade.$dbsuffix necessary_upgrade_completed.$dbsuffix"
flag_filter_only_target=y
- flag_negative_listdb=leaf_ports_to_delete.unselected
+ flag_negative_listdb=leaf_ports_to_delete.selected
;;
resolved )
message_echo "The following ports had problems which have been manually resolved:"
;;
resolved )
message_echo "The following ports had problems which have been manually resolved:"
MYVERSION=4.1.0
COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
# Template for development versions
MYVERSION=4.1.0
COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
# Template for development versions
- MYVERSION=4.0.0+toward_4.1.0_20180916221406
+ MYVERSION=4.0.0+toward_4.1.0_20180918012038
COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
}
COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
}
# Return status 1 for port to skip
reinstall_exec_chk_skip ()
{
# Return status 1 for port to skip
reinstall_exec_chk_skip ()
{
local currentorigin_is_all currentorigin_is_target currentorigin_is_requires_requirements
local currentorigin_is_initial_requirements currentorigin_is_requires_dependents
local currentorigin_is_initial_dependents currentorigin_is_requires_requirements_complement
local currentorigin_is_relevant
local currentorigin_is_all currentorigin_is_target currentorigin_is_requires_requirements
local currentorigin_is_initial_requirements currentorigin_is_requires_dependents
local currentorigin_is_initial_dependents currentorigin_is_requires_requirements_complement
local currentorigin_is_relevant
+ tmpdb=${TMPDIR}/reinstall_exec_chk_skip
database_query_get_target_attributes currentorigin "$REINSTALL_ORIGIN"
if [ -z "${currentorigin_is_all}" -a -z "${currentorigin_is_relevant}" ]
then
database_query_get_target_attributes currentorigin "$REINSTALL_ORIGIN"
if [ -z "${currentorigin_is_all}" -a -z "${currentorigin_is_relevant}" ]
then