aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-05 14:47:22 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-05 14:47:22 +0000
commit32beace50ad36ff442be959e7e5359fe7e47d37b (patch)
tree4544040145718c0f53771472497e0ee675bf030c
parent26400b74074251917c97bbbab7864690f885d00a (diff)
downloadpaludis-32beace50ad36ff442be959e7e5359fe7e47d37b.tar.gz
paludis-32beace50ad36ff442be959e7e5359fe7e47d37b.tar.xz
Don't barf if image exists but contains no files
-rw-r--r--ebuild/builtin_merge.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index f5c24e0..9655f34 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -34,7 +34,7 @@ builtin_merge()
fi
install -d "${ROOT}/" || die "couldn't make \${ROOT} (\"${ROOT}\")"
- if [[ -d "${D}" ]] ; then
+ if [[ -d "${D}" ]] && [[ ${D}/* != "${D}/*" ]] ; then
cp --remove-destination -vdfpR "${D}/"* "${ROOT}/" \
|| die "builtin_merge failed"
fi