aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-26 00:20:35 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-26 00:20:35 +0000
commit1bc2ebdda7f9fd6f5156e9883cb3754c54eaf8a4 (patch)
tree75192e9e1066e7e6068c6450daffbd9cb4ec4b5b
parenta25703fc8fd163f211c94530f99b67805402dc62 (diff)
downloadpaludis-1bc2ebdda7f9fd6f5156e9883cb3754c54eaf8a4.tar.gz
paludis-1bc2ebdda7f9fd6f5156e9883cb3754c54eaf8a4.tar.xz
Don't require that FILESDIR exists
-rw-r--r--paludis/repositories/gentoo/ebuild/builtin_init.bash9
1 files changed, 7 insertions, 2 deletions
diff --git a/paludis/repositories/gentoo/ebuild/builtin_init.bash b/paludis/repositories/gentoo/ebuild/builtin_init.bash
index d7c5042..b51569b 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_init.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_init.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
@@ -28,10 +28,15 @@ builtin_init()
declare -r ${a}="${!a}"
done
- for a in FILESDIR ECLASSDIR PORTDIR DISTDIR ; do
+ for a in ECLASSDIR PORTDIR DISTDIR ; do
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
+ for a in FILESDIR ; do
+ [[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
+ die "\$${a} (\"${!a}\") exists but is not a directory"
+ done
+
if [[ -e "${PALUDIS_TMPDIR}/${CATEGORY}/${PF}" ]] ; then
if type -p chflags &>/dev/null; then
chflags -R 0 "${PALUDIS_TMPDIR}/${CATEGORY}/${PF}" || die "Couldn't remove flags from workdir"