Skip to content

Commit debae8a

Browse files
committed
Always exit with status 11 when SVN
1 parent c322b91 commit debae8a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

msfupdate

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ def print_deprecation_warning
6666
$stdout.puts "[-] "
6767
$stdout.puts "[-] For more on msfupdate and migrating off of SVN, see http://r-7.co/MSF-UP"
6868
$stdout.puts ""
69-
maybe_wait_and_exit 0x11
7069
end
7170

71+
# This only exits if you actually pass a wait option, otherwise
72+
# just returns nil. This is likely unexpected, revisit this.
7273
def maybe_wait_and_exit(exit_code=0)
7374
if @actually_wait
7475
$stdout.puts ""
@@ -132,7 +133,13 @@ end
132133

133134
####### Since we're SVN, do it all this way #######
134135
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.
135140
print_deprecation_warning
141+
$stdin.readline if @actually_wait
142+
exit(0x11) # Comment this to get old functionality back.
136143
@args.push("--config-dir=#{@configdir}")
137144
@args.push("--non-interactive")
138145

0 commit comments

Comments
 (0)