From 4d8bc8146e5c4528a48ff78af4d6de90dbf06243 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Wed, 26 Jun 2019 18:26:33 +0000 Subject: kiss: Remove file conflict check for now. FossilOrigin-Name: 176baa60b238f723125d6fdf991af46cd3a1ff58a1f4b96a2760ce4ebff32245 --- kiss | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kiss b/kiss index 7e38f14..b86b50d 100755 --- a/kiss +++ b/kiss @@ -155,12 +155,7 @@ pkg_conflicts() { # Extract manifest from tarball and strip directories. tar xf "$bin_dir/$pkg" -O "./var/db/$kiss/$name/manifest" | while read -r line; do - [ "${line%%*/}" ] && { - printf '%s\n' "$line" >> "$cac_dir/manifest-$$" - continue - } - - [ ! -f "$sys_dir$line" ] || die "Conflict: $line already exists." + [ "${line%%*/}" ] && printf '%s\n' "$line" >> "$cac_dir/manifest-$$" done || die "Found file conflicts." # Compare extracted manifest to all installed manifests. -- cgit v1.2.3