From e25bde159f078e80134b3160a0d687d6c88959ea Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Wed, 10 Apr 2024 12:53:37 -0700 Subject: [PATCH] pbot-vm: ignore -health and -revert used simultaneously to prevent double-revert --- applets/pbot-vm/host/bin/vm-exec | 5 +++++ lib/PBot/VERSION.pm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/applets/pbot-vm/host/bin/vm-exec b/applets/pbot-vm/host/bin/vm-exec index 86f54f30..2fa678c3 100755 --- a/applets/pbot-vm/host/bin/vm-exec +++ b/applets/pbot-vm/host/bin/vm-exec @@ -263,6 +263,11 @@ sub main() { configure_context($context, $config); + if ($context->{revert} && $context->{health}) { + print STDERR "-health and -revert cannot be used together; aborting.\n"; + exit 0; + } + # instructed to revert machine if ($context->{revert}) { if (exists $config->{aliases}->{$context->{'vm-domain'}}) { diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm index c6698aa9..92573beb 100644 --- a/lib/PBot/VERSION.pm +++ b/lib/PBot/VERSION.pm @@ -25,7 +25,7 @@ use PBot::Imports; # These are set by the /misc/update_version script use constant { BUILD_NAME => "PBot", - BUILD_REVISION => 4741, + BUILD_REVISION => 4745, BUILD_DATE => "2024-04-10", };