From 2d5ecd5c47ab2509f515537e6dbfa050e77060d6 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 2 Feb 2015 15:20:20 +0100
Subject: [export_target] stronger check to see if we have conflicting files
 from different config.tgz modules

---
 server/export_target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/export_target b/server/export_target
index d930b8ee..33e06ad2 100755
--- a/server/export_target
+++ b/server/export_target
@@ -102,7 +102,7 @@ generate_config() {
 		for FILE in $(find . -type f | cut -c 3-); do
 			# check for all the archives we find in TARGET_CONFIG_BUILD_DIR
 			for ARCHIV in $(ls "${TARGET_CONFIG_BUILD_DIR}/"*.tar 2>/dev/null); do
-				if [ "x$(tar tvf "${ARCHIV}" | grep "$FILE")" != "x" ]; then
+				if [ "x$(tar tvf "${ARCHIV}" | grep -E "${FILE}$")" != "x" ]; then
 					# name of the module in conflict
 					local CONFLICTING_MODULE="$(basename ${ARCHIV%.tar})"
 					# file is present in archiv
-- 
cgit v1.2.3-55-g7522