From a72de5ae3a26ed8a91ac97767c2a4ec7cea26624 Mon Sep 17 00:00:00 2001 From: hasufell Date: Thu, 24 Sep 2015 15:46:54 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- paludis/hooks/auto_patch.bash | 8 ++++++++ paludis/hooks/ebuild_unpack_post/ycm.bash | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/paludis/hooks/auto_patch.bash b/paludis/hooks/auto_patch.bash index 0e49098..e6c5686 100644 --- a/paludis/hooks/auto_patch.bash +++ b/paludis/hooks/auto_patch.bash @@ -31,6 +31,10 @@ try_to_apply_patches() einfo "Check ${PATCH_DIR_FULL}" fi if [[ -d ${PATCH_DIR_FULL} ]] ; then + # activate nullglob if it isn't already + local saved_opt=$(shopt nullglob &> /dev/null && echo "yes" || echo "no") + [[ ${saved_opt} == no ]] && shopt -s nullglob + cd "${S}" || die "Failed to cd into ${S}!" for i in "${PATCH_DIR_FULL}"/*.patch ; do if declare -f epatch >/dev/null ; then @@ -42,6 +46,10 @@ try_to_apply_patches() fi touch "${_ap_rememberfile}" || die "Failed to touch ${_ap_rememberfile}!" done + + # make sure nullglob is set to what it was before this function was called + [[ ${saved_opt} == no ]] && shopt -u nullglob + if [[ -e ${_ap_rememberfile} ]]; then issue_a_warning "will be" else diff --git a/paludis/hooks/ebuild_unpack_post/ycm.bash b/paludis/hooks/ebuild_unpack_post/ycm.bash index 05a7907..ad8f525 100644 --- a/paludis/hooks/ebuild_unpack_post/ycm.bash +++ b/paludis/hooks/ebuild_unpack_post/ycm.bash @@ -1,2 +1,10 @@ #!/bin/bash +source "${PALUDIS_EBUILD_DIR}/echo_functions.bash" + +ebegin "Working around ycm broken live dirs" +if [[ ${CATEGORY}/${PN} == app-vim/youcompleteme ]] ; then + mkdir -p "${S}"/third_party/ycmd/third_party/sh + touch "${S}"/third_party/ycmd/libclang.so +fi +eend $?