From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Jun 2020 21:50:41 +0000 (+0100)
Subject: nailing-cargo: Refactor cargo subcommand handling very slightly.
X-Git-Tag: nailing-cargo/1.0.0~185
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=nailing-cargo.git;a=commitdiff_plain;h=b56effed2c01e879d43d9534f5af7ce31da9dcfb

nailing-cargo: Refactor cargo subcommand handling very slightly.

Part 2.  No functional change.

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

diff --git a/nailing-cargo b/nailing-cargo
index 9e74050..d14f194 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -500,10 +500,11 @@ sub calculate () {
 
 sub addargs () {
   if (@ARGV>=2 &&
-      $ARGV[0] =~ m{\bcargo\b} &&
-      $ARGV[1] =~ m/^(?:generate-lockfile|update)$/) {
-    $cargo_lock_update //= 1;
-    $target = undef;
+      $ARGV[0] =~ m{\bcargo\b}) {
+    if ($ARGV[1] =~ m/^(?:generate-lockfile|update)$/) {
+      $cargo_lock_update //= 1;
+      $target = undef;
+    }
   }
   $cargo_lock_update //= 0;
   $cargo_manifest_args //=