From 19e7923b82fc34ba7086a93da55add84e8a08b67 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 26 Nov 2011 13:32:26 -0500
Subject: functions: don't allow add_binary to re-add deps

Since we now silently overwrite instead of silently failing on existing
files and symlinks, we have a lot of sodeps which are overwritten by
various binaries -- udevd and udevadm being one example. Nip this in
add_binary by doing our own check and preventing addition of
pre-existing files in the $BUILDROOT.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions b/functions
index 857a613..7af23c1 100644
--- a/functions
+++ b/functions
@@ -316,7 +316,7 @@ add_binary() {
     while read line; do
         [[ "$line" =~ $regex ]] && sodep=${BASH_REMATCH[1]} || continue
 
-        if [[ -f "$sodep" ]]; then # -f follows symlinks, don't believe it!
+        if [[ -f $sodep && ! -e $BUILDROOT$sodep ]]; then
             if [[ ! -L $sodep ]]; then
                 _add_file "$sodep" "$BASEDIR$sodep" "$(stat -c %a "$sodep")"
             else
-- 
cgit v1.2.3-24-g4f1b