• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

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


Commit MetaInfo

Revision0a211086a5b90cf8e6f63ba5e66f3aa8d1b56321 (tree)
Time2018-09-12 22:20:53
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

Fixed a bug related to the previous modification.

Changes to be committed:

modified: lib/libcommand_pkgs.sh
modified: lib/libmain.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- cat "${DBDIR}/moved_ports" "${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" 2> /dev/null
277277 dstdir=${DBDIR}/command_packupgrade
278278 rm -rf "$dstdir" "$dstdir.tar.gz"
279279 mkdir -p "$dstdir"
@@ -294,7 +294,7 @@ command_pkgs_packupgrade_create__manifest_delete ()
294294 {
295295 local origin
296296 origin=$1
297- printf '%s\t%s\t%s\n' delete "$pkgname" "$origin" >> ${DBDIR}/command_packupgrade/etc/manifest.lst.delete
297+ printf '%s\t%s\t%s\n' delete - "$origin" >> ${DBDIR}/command_packupgrade/etc/manifest.lst.delete
298298 }
299299 _program_exec_and_record_completion__operation ()
300300 {
@@ -356,13 +356,13 @@ command_pkgs_packupgrade_create__manifest_reinst ()
356356 then
357357 while read origin_old
358358 do
359- printf '%s\t%s\t%s\n' delete "$pkgname" "$origin_old"
359+ printf '%s\t%s\t%s\n' delete - "$origin_old"
360360 done < ${DBDIR}/moved_from/$origin/initial_orig >> $tmp_manifest
361361 fi
362- printf '%s\t%s\t%s\n' delete "$pkgname" "$origin" >> $tmp_manifest
362+ printf '%s\t%s\t%s\n' delete - "$origin" >> $tmp_manifest
363363 pkgsys_get_conflicting_pkgs_patterns install "$origin" | while read pkg_pattern
364364 do
365- printf '%s\t%s\t%s\n' delete_pattern "$pkgname" "$pkg_pattern" >> $tmp_manifest
365+ printf '%s\t%s\t%s\n' delete_pattern - "$pkg_pattern" >> $tmp_manifest
366366 done
367367 printf '%s\t%s\t%s\n' add "$pkgname" null >> $tmp_manifest
368368 fi
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
1212 MYVERSION=4.1.0
1313 COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
1414 # Template for development versions
15- MYVERSION=4.0.0+toward_4.1.0_20180912193809
15+ MYVERSION=4.0.0+toward_4.1.0_20180912212038
1616 COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
1717 }
1818
--- a/lib/upgrade/libcommand_do.sh
+++ b/lib/upgrade/libcommand_do.sh
@@ -41,7 +41,7 @@ command_do_chk_pkg_paths ()
4141 additional=$pkgpath
4242 ;;
4343 delete | delete_pattern )
44- argument=
44+ argument=-
4545 ;;
4646 *)
4747 message_echo "ERROR: Invalid command [$cmd $target $argument" >&2
@@ -91,6 +91,7 @@ command_do_reinst_ports ()
9191 then
9292 message_echo "Dry run: Delete $target_pkg"
9393 else
94+ message_echo "Deleting $target_pkg..."
9495 pkg_delete_f "$target_pkg" || \
9596 { message_echo "(Ignored)" >&2; }
9697 fi
@@ -104,6 +105,7 @@ command_do_reinst_ports ()
104105 then
105106 message_echo "Dry run: Delete $pkgname"
106107 else
108+ message_echo "Deleting $pkgname..."
107109 pkg_delete_f "$pkgname" || \
108110 { message_echo "(Ignored)" >&2; }
109111 fi
@@ -146,6 +148,7 @@ command_do_reinst_ports ()
146148 done
147149 message_echo "Dry run: Add $pkgpath (package management tool)"
148150 else
151+ message_echo "Upgrading $pkgs_pkgtools..."
149152 pkg_delete_f $pkgs_pkgtools || \
150153 { message_echo "(Ignored)" >&2; }
151154 pkg_add_tools "$pkgpath" || pkg_rescue_tools
Show on old repository browser