• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

This is for active development.
New funtionalities are to be added actively.


Commit MetaInfo

Revision03944fb0de72a5e824ef2497a3db823126e0d0e9 (tree)
Time2018-09-13 01:59:32
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

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

Change Summary

Incremental Difference

--- a/lib/libcommand_pkgs.sh
+++ b/lib/libcommand_pkgs.sh
@@ -273,7 +273,7 @@ command_pkgs_packupgrade_create__prepare ()
273273 message_section_title "Preparation"
274274 mkdir -p "${PACKAGES}/${PKGREPOSITORYSUBDIR}"
275275 cp "${DBDIR}/reinst_order.list" "${DBDIR}/stage.loop_list/command_packupgrade_pack"
276- cp "${DBDIR}/stage.loop_list/ports_to_delete" "${DBDIR}/stage.loop_list/command_packupgrade_delete" 2> /dev/null
276+ cp "${DBDIR}/stage.loop_list/ports_to_delete" "${DBDIR}/stage.loop_list/command_packupgrade_delete"
277277 dstdir=${DBDIR}/command_packupgrade
278278 rm -rf "$dstdir" "$dstdir.tar.gz"
279279 mkdir -p "$dstdir"
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -779,7 +779,7 @@ pkgsys_def_pkgtools ()
779779 pkg_update_pkgrepository ()
780780 {
781781 local opts
782- pkg_is_tool_available || return 0
782+ pkg_rescue_tools || return 0
783783 if [ $opt_batch_mode = no ]
784784 then
785785 opts=
--- a/lib/upgrade/libcommand_do.sh
+++ b/lib/upgrade/libcommand_do.sh
@@ -160,6 +160,7 @@ command_do_reinst_ports ()
160160 _program_exec_and_record_completion__operation ()
161161 {
162162 message_section_title "Smart update"
163+ pkg_rescue_tools
163164 program_exec_restartable_loop_operation manifest_pkgpath
164165 cp /dev/null "${DBDIR}/stage.loop_list/failed_add_again"
165166 message_echo
Show on old repository browser