Made portsreinstall-upgrade available even pkg(8) is not installed at first.

 Changes to be committed:
	modified:   lib/libcommand_pkgs.sh
	modified:   lib/libpkgsys.sh
	modified:   lib/upgrade/libcommand_do.sh

diff --git a/lib/libcommand_pkgs.sh b/lib/libcommand_pkgs.sh
index 75fde3a..4518b07 100644 (file)
--- a/lib/libcommand_pkgs.sh
+++ b/lib/libcommand_pkgs.sh
@@ -273,7 +273,7 @@ command_pkgs_packupgrade_create__prepare ()
                message_section_title "Preparation"
                mkdir -p "${PACKAGES}/${PKGREPOSITORYSUBDIR}"
                cp "${DBDIR}/reinst_order.list" "${DBDIR}/stage.loop_list/command_packupgrade_pack"
-               cp "${DBDIR}/stage.loop_list/ports_to_delete" "${DBDIR}/stage.loop_list/command_packupgrade_delete" 2> /dev/null
+               cp "${DBDIR}/stage.loop_list/ports_to_delete" "${DBDIR}/stage.loop_list/command_packupgrade_delete"
                dstdir=${DBDIR}/command_packupgrade
                rm -rf "$dstdir" "$dstdir.tar.gz"
                mkdir -p "$dstdir"

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index f985fb7..10d68f7 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -779,7 +779,7 @@ pkgsys_def_pkgtools ()
                pkg_update_pkgrepository ()
                {
                        local opts
-                       pkg_is_tool_available || return 0
+                       pkg_rescue_tools || return 0
                        if [ $opt_batch_mode = no ]
                        then
                                opts=

diff --git a/lib/upgrade/libcommand_do.sh b/lib/upgrade/libcommand_do.sh
index 41ba502..8814429 100644 (file)
--- a/lib/upgrade/libcommand_do.sh
+++ b/lib/upgrade/libcommand_do.sh
@@ -160,6 +160,7 @@ command_do_reinst_ports ()
        _program_exec_and_record_completion__operation ()
        {
                message_section_title "Smart update"
+               pkg_rescue_tools
                program_exec_restartable_loop_operation manifest_pkgpath
                cp /dev/null "${DBDIR}/stage.loop_list/failed_add_again"
                message_echo