chiark
/
gitweb
/
~ianmdlvl
/
nailing-cargo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5c7b413
)
nailing-cargo: Fix uninstall
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 10 May 2020 23:29:46 +0000
(
00:29
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 10 May 2020 23:29:46 +0000
(
00:29
+0100)
(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
patch
|
blob
|
history
diff --git
a/nailing-cargo
b/nailing-cargo
index 221b05f26b27c87741ff49294b37c229cef37a47..64f84ba025dab86172de0551ac42b25cf8bc372a 100755
(executable)
--- 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;