From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 Mar 2020 16:41:59 +0000 (+0000)
Subject: nailing-cargo: skip dependencies with path already specified
X-Git-Tag: nailing-cargo/1.0.0~243
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=191a962f3b582b0ccaca741303a46445e7d91207;p=nailing-cargo.git

nailing-cargo: skip dependencies with path already specified

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

diff --git a/nailing-cargo b/nailing-cargo
index 1cc6138..0d274dd 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -55,6 +55,7 @@ while read <&204 what where; do
 	if [ "x$what" = 'x#' ]; then continue; fi
 	qwhere="${where//\//\\/}"
 	sed+='
+		/{.*path *=/ b
 		s/^'$what' *= *\(\".*\"\) *$/'$what' = { version = \1 }/;
 		s#^'$what' *= *{#'$what' = { path = "'"${PWD%/*}"'/'"${qwhere}"'", #;
 		/^'$what' *=/ s/version *= *\"[^"]*\"//;