• R/O
  • HTTP
  • SSH
  • HTTPS

current: Commit

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


Commit MetaInfo

Revision9a6971368f246cb02c354c89de050a7c148dcfab (tree)
Time2018-09-14 13:10:45
AuthorMamoru Sakaue / MwGhennndo <glmwghennndo@user...>
CommiterMamoru Sakaue / MwGhennndo

Log Message

Added option -g to portsreinstall-chroot.

Changes to be committed:

modified: HISTORY
modified: lib/chroot/libcommand_do.sh
modified: lib/chroot/liboptions.sh
modified: lib/chroot/libusage.sh
modified: man/portsreinstall-chroot.8

Change Summary

Incremental Difference

--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,7 @@
11 4.1.0 (?? September 2018)
22 [NEW] Options -j and -x are added.
33 [NEW] Option -J is added to the all utilities.
4-[NEW] Options -f and -s are added to portsreinstall-chroot(8).
4+[NEW] Options -f, -g and -s are added to portsreinstall-chroot(8).
55 [NEW] auto and destroy commands are added to portsreinstall-chroot(8).
66 [NEW] pkg, make, show build_conflict_pkgs, show inst_conflict_pkgs, show errormessage, show inst_by_pkg, show inst_built_default, show inst_built_custom, show fossil, show moved, show leaves and show obsolete commands are added.
77 [NEW] Command show status newly supports inst_by_pkg, inst_built_default, inst_built_custom and fossil.
--- a/lib/chroot/libcommand_do.sh
+++ b/lib/chroot/libcommand_do.sh
@@ -257,12 +257,14 @@ command_do_main_init_resinst ()
257257 PROGRAM_DEPENDS='STARTER_GUEST_CLEAN'
258258 _program_exec_and_record_completion__operation ()
259259 {
260- local exitstatus
260+ local opts opt_smart
261261 [ $opt_fullcourse = no ] && return
262262 message_section_title "Full course main: Initiate the reinstallation process"
263263 opts=
264264 [ $opt_batch_mode = yes ] && opts='-Ya'
265- chroot "$opt_basedir"/builder /usr/bin/env ${PROGRAM} -SJCGjqx $opts
265+ opt_smart=
266+ [ $opt_upgraded_system = no ] && opt_smart='-q'
267+ chroot "$opt_basedir"/builder /usr/bin/env ${PROGRAM} -SJCGjx $opts $opt_smart
266268 message_echo
267269 }
268270 program_exec_and_record_completion STARTER_GUEST_INIT_REINST
--- a/lib/chroot/liboptions.sh
+++ b/lib/chroot/liboptions.sh
@@ -35,6 +35,7 @@ c suppress-clean-obsolete-database opt_suppress_obsolete_db_clean no yes
3535 d invalidate-mount-privilege opt_invalidate_mount_privilege no yes
3636 e extra-dirs opt_extra_dirs '' :
3737 f fullcourse opt_fullcourse no yes
38+g upgraded-system opt_upgraded_system no yes
3839 p load-pkgtoolsconf-as-default opt_load_pkgtoolsconf undef default
3940 P load-pkgtoolsconf-as-override opt_load_pkgtoolsconf undef override
4041 Q ignore-pkgtoolsconf opt_load_pkgtoolsconf undef no
--- a/lib/chroot/libusage.sh
+++ b/lib/chroot/libusage.sh
@@ -29,6 +29,7 @@ USAGE: portsreinstall-chroot [OPTIONS] [--] [command]
2929 -d : Forcibly invalidate the privilege of mounting/unmounting file systems.
3030 -e dir[,dir2[,...]] : Extra directories to mount for the chroot environment.
3131 -f : Full course mode.
32+ -g : Adjust all operations as post-processes after system upgrade.
3233 -P : Import settings from pkgtools.conf(5) as the secondary if exists.
3334 -p : Import settings from pkgtools.conf(5) as the primary if exists (default).
3435 -Q : Ignore pkgtools.conf(5) even if it exists.
--- a/man/portsreinstall-chroot.8
+++ b/man/portsreinstall-chroot.8
@@ -199,6 +199,13 @@ Carry out the \fBdo\fR process as the "full course" automatic mode where update
199199 Resuming \fBdo\fR command automatically executes \fBportsreinstall\fR(8) in the builder \fBchroot\fR(8) environment.
200200 With \fB\-a\fR option, the all detected leaf and obsolete packages will be deleted.
201201 .PD
202+.IP \fB\-g\fR
203+.PD 0
204+.TP
205+\fB\-\-upgraded\-system\fR
206+Adjust the all operations to be suitable as post-processes after system upgrade.
207+Concretely, the full course mode is adjusted to reinstall the all ports by removing \fB\-q\fR option of \fBportsreinstall\fR(8).
208+.PD
202209 .IP \fB\-P\fR
203210 .PD 0
204211 .TP
Show on old repository browser