11use crate :: command:: CommandExt ;
22use crate :: execution_context:: ExecutionContext ;
3- use crate :: executor:: RunType ;
43use crate :: terminal:: print_separator;
54use color_eyre:: eyre:: Result ;
65use rust_i18n:: t;
76use std:: fs;
7+ use tracing:: debug;
88
9- fn is_openbsd_current ( ctx : & ExecutionContext ) -> Result < bool > {
9+ fn is_openbsd_current ( ) -> Result < bool > {
1010 let motd_content = fs:: read_to_string ( "/etc/motd" ) ?;
1111 let is_current = [ "-current" , "-beta" ] . iter ( ) . any ( |& s| motd_content. contains ( s) ) ;
12- match ctx. config . run_type ( ) {
13- RunType :: Dry | RunType :: Damp => {
14- println ! ( "{}" , t!( "Checking if /etc/motd contains -current or -beta" ) ) ;
15- }
16- RunType :: Wet => { }
17- }
12+
13+ debug ! ( "OpenBSD is -current/-beta: {is_current}" ) ;
14+
1815 Ok ( is_current)
1916}
2017
@@ -23,12 +20,7 @@ pub fn upgrade_openbsd(ctx: &ExecutionContext) -> Result<()> {
2320
2421 let sudo = ctx. require_sudo ( ) ?;
2522
26- let is_current = is_openbsd_current ( ctx) ?;
27-
28- if ctx. config ( ) . dry_run ( ) {
29- println ! ( "{}" , t!( "Would upgrade the OpenBSD system" ) ) ;
30- return Ok ( ( ) ) ;
31- }
23+ let is_current = is_openbsd_current ( ) ?;
3224
3325 if is_current {
3426 sudo. execute ( ctx, "/usr/sbin/sysupgrade" ) ?. arg ( "-sn" ) . status_checked ( )
@@ -42,7 +34,7 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
4234
4335 let sudo = ctx. require_sudo ( ) ?;
4436
45- let is_current = is_openbsd_current ( ctx ) ?;
37+ let is_current = is_openbsd_current ( ) ?;
4638
4739 if ctx. config ( ) . cleanup ( ) {
4840 sudo. execute ( ctx, "/usr/sbin/pkg_delete" ) ?. arg ( "-ac" ) . status_checked ( ) ?;
0 commit comments