aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 11:45:10 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-11 11:45:10 +0000
commit0259d62fb0d1bb43b1a36765f979cac1c42be134 (patch)
treea9c8f43edbdbefaebbba4859bae7aeecc089da3d
parent4c4d3e26f4d060c4babadb8be203d3bb16d17ad1 (diff)
downloadpaludis-0259d62fb0d1bb43b1a36765f979cac1c42be134.tar.gz
paludis-0259d62fb0d1bb43b1a36765f979cac1c42be134.tar.xz
Warn on symlink / non-symlink merge discrepancies
-rw-r--r--ebuild/utils/Makefile.am1
-rwxr-xr-xebuild/utils/merge14
2 files changed, 15 insertions, 0 deletions
diff --git a/ebuild/utils/Makefile.am b/ebuild/utils/Makefile.am
index 7f08932..b7a8182 100644
--- a/ebuild/utils/Makefile.am
+++ b/ebuild/utils/Makefile.am
@@ -41,6 +41,7 @@ libexecprog_SCRIPTS = \
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+ PALUDIS_EBUILD_LOG_LEVEL="silent" \
TEST_SCRIPT_DIR="$(srcdir)/" \
$(SHELL) $(top_srcdir)/ebuild/utils/run_test.bash
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index d706b7d..c36eee8 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -17,6 +17,8 @@
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA
+source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+
if [[ -z "${1}" ]] || [[ -z "${2}" ]] ; then
echo "usage: ${0} from to"
exit 247
@@ -61,6 +63,18 @@ merge_this()
ff=$(basename "${f}" )
echo ">>> ${2#${top_dst}}/${ff}"
+ if [[ -L "${2}/${ff}" ]] ; then
+ if ! [[ -L "${f}" ]] ; then
+ ebuild_notice "qa" "ROOT has '${2}/${ff}' as a non-symlink, " \
+ "but IMAGE '${f}' is a symlink"
+ fi
+ else
+ if [[ -L "${f}" ]] ; then
+ ebuild_notice "qa" "ROOT has '${2}/${ff}' as a symlink, " \
+ "but IMAGE '${f}' is a non-symlink"
+ fi
+ fi
+
if [[ -L "${f}" ]] ; then
if [[ -e "${2}/${ff}" ]] && ! rm -f "${2}/${ff}" ; then
echo "error removing ${2}/${ff} for link ${f}"