From f6acfa3121b98a13b221ea352efc179beeb7d147 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 11 May 2020 00:29:46 +0100
Subject: [PATCH] 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>
---
 nailing-cargo | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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;
-- 
2.30.2