From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Jun 2020 18:29:19 +0000 (+0100)
Subject: nailing-cargo: Fix handling of unrecogised (ie cargo) short options
X-Git-Tag: nailing-cargo/1.0.0~115
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=76bf4edb4efe30f02609f5c9829b85cba45d62da;p=nailing-cargo.git

nailing-cargo: Fix handling of unrecogised (ie cargo) short options

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index 08e82f1..e737d78 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -669,7 +669,7 @@ sub parse_args () {
   #    $is_cargo==1   <cargo-command> <cargo-opts> [--] <subcmd>...
   #    $is_cargo==0   <build-command>...
 
-  for (;;) {
+ OPTS: for (;;) {
     @ARGV or die "$self: need cargo subcommand\n";
 
     $_ = shift @ARGV;
@@ -680,7 +680,7 @@ sub parse_args () {
       unshift @ARGV, 'cargo';
       $is_cargo = 1;
       no warnings qw(exiting);
-      last;
+      last OPTS;
     };
     $not_a_nailing_opt->() unless m{^-};
     $not_a_nailing_opt->() if $_ eq '--';