From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 May 2020 23:29:46 +0000 (+0100)
Subject: nailing-cargo: Fix uninstall
X-Git-Tag: nailing-cargo/1.0.0~198
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f6acfa3121b98a13b221ea352efc179beeb7d147;p=nailing-cargo.git

nailing-cargo: Fix uninstall

(i) Do it in the right place and (ii) set $want_uninstall to 0
afterwards so we won't run it again (!)

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

diff --git a/nailing-cargo b/nailing-cargo
index 221b05f..64f84ba 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -629,11 +629,11 @@ printf STDERR "$self: nailed (%s manifests, %s packages)\n",
 print STDERR "$self: invoking: @display_cmd\n" if $verbose;
 my $estatus = invoke();
 
-uninstall();
-$want_uninstall = 1;
-
 cargo_lock_update_after();
 
+uninstall();
+$want_uninstall = 0;
+
 print STDERR "$self: unnailed.  status $estatus.\n" if $verbose;
 
 exit $estatus;