File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -66,9 +66,10 @@ def print_deprecation_warning
66
66
$stdout. puts "[-] "
67
67
$stdout. puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
68
68
$stdout. puts ""
69
- maybe_wait_and_exit 0x11
70
69
end
71
70
71
+ # This only exits if you actually pass a wait option, otherwise
72
+ # just returns nil. This is likely unexpected, revisit this.
72
73
def maybe_wait_and_exit ( exit_code = 0 )
73
74
if @actually_wait
74
75
$stdout. puts ""
132
133
133
134
####### Since we're SVN, do it all this way #######
134
135
if is_svn
136
+ # We're fully deprecated now, so just exit.
137
+ # Leaving in the commented code in case someone wants to
138
+ # get a last-chance at msfupdate before the SVN server goes
139
+ # off line, which will be ANY DAY NOW. Seriously.
135
140
print_deprecation_warning
141
+ $stdin. readline if @actually_wait
142
+ exit ( 0x11 ) # Comment this to get old functionality back.
136
143
@args . push ( "--config-dir=#{ @configdir } " )
137
144
@args . push ( "--non-interactive" )
138
145
You can’t perform that action at this time.
0 commit comments