From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 May 2020 23:57:34 +0000 (+0100)
Subject: nailing-cargo: Fix unaltcargo error handling in cleanup
X-Git-Tag: nailing-cargo/1.0.0~194
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=324c56dc883660c8ede97c9c4d124ad17fec767e;p=nailing-cargo.git

nailing-cargo: Fix unaltcargo error handling in cleanup

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

diff --git a/nailing-cargo b/nailing-cargo
index c479630..f0456da 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -507,7 +507,7 @@ END {
     foreach my $mf (keys %manifests) {
       eval { uninstall1($mf,1); 1; } or warn "$@";
     }
-    unaltcargolock(1) or warn "$@";
+    eval { unaltcargolock(1); 1; } or warn "$@";
   }
 }