aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-26 02:14:39 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-05-26 02:14:39 +0000
commita2633a4c86648f7af1b61708338eac60d4e66adc (patch)
tree18fac3f10a8c4471877c4deeb9f27dbc7c5429b3
parentde5efa562a26fac397f4131385e4b43be96febbc (diff)
downloadpaludis-a2633a4c86648f7af1b61708338eac60d4e66adc.tar.gz
paludis-a2633a4c86648f7af1b61708338eac60d4e66adc.tar.xz
More autotools debugging
-rwxr-xr-xebuild/utils/merge5
-rwxr-xr-xebuild/utils/unmerge5
2 files changed, 10 insertions, 0 deletions
diff --git a/ebuild/utils/merge b/ebuild/utils/merge
index 85e8f8c..1adb9ef 100755
--- a/ebuild/utils/merge
+++ b/ebuild/utils/merge
@@ -19,6 +19,11 @@
source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+if ! type canonicalise 1>/dev/null ; then
+ echo "canonicalise not in PATH (${PATH})"
+ exit 246
+fi
+
if [[ -z "${1}" ]] || [[ -z "${2}" ]] ; then
echo "usage: ${0} from to contents"
exit 247
diff --git a/ebuild/utils/unmerge b/ebuild/utils/unmerge
index 17dce91..4529a06 100755
--- a/ebuild/utils/unmerge
+++ b/ebuild/utils/unmerge
@@ -19,6 +19,11 @@
source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+if ! type canonicalise 1>/dev/null ; then
+ echo "canonicalise not in PATH (${PATH})"
+ exit 246
+fi
+
if [[ -z "${1}" ]] || [[ -z "${2}" ]] ; then
echo "usage: ${0} from contents"
exit 247