Fixed to suppress warnings of missing requirements.all.full in build of mandatory...

 Changes to be committed:
	modified:   lib/libmain.sh

diff --git a/lib/libmain.sh b/lib/libmain.sh
index e1696a1..d4ebe44 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180802005003
+       MYVERSION=4.0.0+toward_4.1.0_20180802204253
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
@@ -378,12 +378,14 @@ main_upgrade_pkg8_if_new ()
                PROGRAM_DEPENDS='PRELIMINARY_INSPECTION_OF_TOOLS'
                _program_exec_and_record_completion__operation ()
                {
-                       local _MSG_CURRENT_STAGE_general
+                       local _MSG_CURRENT_STAGE_general origin
                        _MSG_CURRENT_STAGE_general="pkg(8) upgrade"
+                       origin=`pkgsys_portsmgmt_pkg`
                        temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
-                       message_section_title "Upgrade of `pkgsys_portsmgmt_pkg` if new"
+                       message_section_title "Upgrade of $origin if new"
                        touch "${DBDIR}/target_all"
-                       reinstall_exec `pkgsys_portsmgmt_pkg`
+                       cp "${DBDIR}/requires/$origin/requirements.all.direct.src" "${DBDIR}/requires/$origin/requirements.all.full"
+                       reinstall_exec "$origin"
                        reinstall_restore_conflicts
                        rm -f "${DBDIR}/target_all"
                        temp_set_msg_current_stage
@@ -405,12 +407,14 @@ main_upgrade_dialog4ports1_if_new ()
                PROGRAM_DEPENDS='PRELIMINARY_INSPECTION_OF_TOOLS'
                _program_exec_and_record_completion__operation ()
                {
-                       local _MSG_CURRENT_STAGE_general
+                       local _MSG_CURRENT_STAGE_general origin
                        _MSG_CURRENT_STAGE_general="dialog4ports(1) upgrade"
+                       origin=`pkgsys_portsmgmt_dialog4ports`
                        temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
-                       message_section_title "Upgrade of `pkgsys_portsmgmt_dialog4ports` if new"
+                       message_section_title "Upgrade of $origin if new"
                        touch "${DBDIR}/target_all"
-                       reinstall_exec `pkgsys_portsmgmt_dialog4ports`
+                       cp "${DBDIR}/requires/$origin/requirements.all.direct.src" "${DBDIR}/requires/$origin/requirements.all.full"
+                       reinstall_exec "$origin"
                        reinstall_restore_conflicts
                        rm -f "${DBDIR}/target_all"
                        temp_set_msg_current_stage
@@ -437,6 +441,7 @@ main_self_upgrade ()
                        temp_set_msg_current_stage "${_MSG_CURRENT_STAGE_general}"
                        message_section_title "Upgrade of this utility if new"
                        touch "${DBDIR}/target_all"
+                       cp "${DBDIR}/requires/$MYPORTORIGIN/requirements.all.direct.src" "${DBDIR}/requires/$MYPORTORIGIN/requirements.all.full"
                        reinstall_exec "$MYPORTORIGIN"
                        reinstall_restore_conflicts
                        rm -f "${DBDIR}/target_all"