aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-26 03:00:35 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-26 03:00:35 +0000
commit4f191ceff8c10a699cdc28d5cbba2d3c3198ac9a (patch)
tree4df8a119541a9a80d9009b0ca846529d5b58b779
parente59d93c5e5adbdc4c6df212956127704c9b94f7e (diff)
downloadpaludis-4f191ceff8c10a699cdc28d5cbba2d3c3198ac9a.tar.gz
paludis-4f191ceff8c10a699cdc28d5cbba2d3c3198ac9a.tar.xz
Yet another attempt at working around autovoodoo weirdness
-rwxr-xr-xebuild/utils/merge6
-rwxr-xr-xebuild/utils/unmerge6
2 files changed, 2 insertions, 10 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index 1adb9ef..d1d06d7 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -18,11 +18,7 @@
# Place, Suite 330, Boston, MA 02111-1307 USA
source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
-
-if ! type canonicalise 1>/dev/null ; then
- echo "canonicalise not in PATH (${PATH})"
- exit 246
-fi
+export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
if [[ -z "${1}" ]] || [[ -z "${2}" ]] ; then
echo "usage: ${0} from to contents"
diff --git a/ebuild/utils/unmerge b/ebuild/utils/unmerge
index 4529a06..66bb69d 100755
--- a/ebuild/utils/unmerge
+++ b/ebuild/utils/unmerge
@@ -18,11 +18,7 @@
# Place, Suite 330, Boston, MA 02111-1307 USA
source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
-
-if ! type canonicalise 1>/dev/null ; then
- echo "canonicalise not in PATH (${PATH})"
- exit 246
-fi
+export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
if [[ -z "${1}" ]] || [[ -z "${2}" ]] ; then
echo "usage: ${0} from contents"