aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2019-06-26 18:26:33 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2019-06-26 18:26:33 +0000
commit4d8bc8146e5c4528a48ff78af4d6de90dbf06243 (patch)
tree498dfb1816323f34695e9f12f1d91cb2ed920a41
parentf9909596f03d17002f2444082169767e5c595fa1 (diff)
downloadcpt-4d8bc8146e5c4528a48ff78af4d6de90dbf06243.tar.gz
kiss: Remove file conflict check for now.
FossilOrigin-Name: 176baa60b238f723125d6fdf991af46cd3a1ff58a1f4b96a2760ce4ebff32245
-rwxr-xr-xkiss7
1 files changed, 1 insertions, 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.