aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-06 20:12:32 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-06 20:12:32 +0000
commit4145dff573dcbf077421585bbbfa522864b461f4 (patch)
tree2e0bae3742a1afb67092ce596f948ee901e6870a
parent2592e84abee0edfc7164732b116be430dc822090 (diff)
downloadpaludis-4145dff573dcbf077421585bbbfa522864b461f4.tar.gz
paludis-4145dff573dcbf077421585bbbfa522864b461f4.tar.xz
Be less strict about vars in initrm, initmisc
-rw-r--r--paludis/repositories/e/eapis/0.conf8
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf6
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf8
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_init.bash5
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_initmisc.bash3
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_initrm.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_init.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash3
9 files changed, 30 insertions, 12 deletions
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index c594351..a7be086 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -38,15 +38,15 @@ binary_from_env_variables = \
GENERATED_FROM_REPOSITORY KEYWORDS BINARY_KEYWORDS BINARY_URI
non_empty_variables = \
- P PV PR PN PVR PF CATEGORY FILESDIR ECLASSDIR PORTDIR \
- DISTDIR KV PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
+ P PV PR PN PVR PF CATEGORY build:FILESDIR build:ECLASSDIR build:PORTDIR \
+ build:DISTDIR build:KV PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
USERLAND KERNEL ARCH CHOST PALUDIS_COMMAND ROOT
directory_variables = \
- ECLASSDIR PORTDIR DISTDIR
+ build:ECLASSDIR build:PORTDIR build:DISTDIR
directory_if_exists_variables = \
- FILESDIR
+ build:FILESDIR
ebuild_must_not_set_variables =
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index cebc519..76758f7 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -41,15 +41,15 @@ binary_from_env_variables = \
GENERATED_FROM_REPOSITORY PLATFORMS BINARY_PLATFORMS
non_empty_variables = \
- P PV PR PN PVR PF CATEGORY FILESDIR EXLIBSDIRS FETCHEDDIR REPODIR \
+ P PV PR PN PVR PF CATEGORY build:FILESDIR build:EXLIBSDIRS build:FETCHEDDIR build:REPODIR \
PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
PALUDIS_COMMAND ROOT
directory_variables = \
- FETCHEDDIR REPODIR
+ build:FETCHEDDIR build:REPODIR
directory_if_exists_variables = \
- FILESDIR
+ build:FILESDIR
ebuild_must_not_set_variables = \
DEPEND RDEPEND PDEPEND PROVIDE
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 9b52811..e7a6e3f 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -41,15 +41,15 @@ binary_from_env_variables = \
GENERATED_FROM_REPOSITORY KEYWORDS BINARY_KEYWORDS BINARY_URI
non_empty_variables = \
- P PV PR PN PVR PF CATEGORY FILESDIR ECLASSDIR PORTDIR \
- DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
+ P PV PR PN PVR PF CATEGORY build:FILESDIR build:ECLASSDIR build:PORTDIR \
+ build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
USERLAND KERNEL ARCH CHOST PALUDIS_COMMAND ROOT
directory_variables = \
- ECLASSDIR PORTDIR DISTDIR
+ build:ECLASSDIR build:PORTDIR build:DISTDIR
directory_if_exists_variables = \
- FILESDIR
+ build:FILESDIR
ebuild_must_not_set_variables =
diff --git a/paludis/repositories/e/ebuild/0/builtin_init.bash b/paludis/repositories/e/ebuild/0/builtin_init.bash
index 19821d5..855ce68 100644
--- a/paludis/repositories/e/ebuild/0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_init.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
#
# 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
@@ -20,15 +20,18 @@ builtin_init()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ a=${a#build:}
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ a=${a#build:}
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ a=${a#build:}
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done
diff --git a/paludis/repositories/e/ebuild/0/builtin_initmisc.bash b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
index a36c55c..274d94a 100644
--- a/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash
@@ -20,15 +20,18 @@ builtin_initmisc()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done
diff --git a/paludis/repositories/e/ebuild/0/builtin_initrm.bash b/paludis/repositories/e/ebuild/0/builtin_initrm.bash
index be51bf9..b9ea60f 100644
--- a/paludis/repositories/e/ebuild/0/builtin_initrm.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_initrm.bash
@@ -20,15 +20,18 @@ builtin_initrm()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
index 2b99e66..14335a4 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
@@ -20,15 +20,18 @@ builtin_init()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ a=${a#build:}
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ a=${a#build:}
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ a=${a#build:}
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
index 11de213..000dcf8 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
@@ -20,15 +20,18 @@ builtin_initmisc()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
index b4a5942..c571a1d 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
@@ -20,15 +20,18 @@ builtin_initrm()
{
local a
for a in PALUDIS_NON_EMPTY_VARIABLES ${PALUDIS_NON_EMPTY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -z "${!a}" ]] && die "\$${a} unset or empty"
declare -r ${a}="${!a}"
done
for a in ${PALUDIS_DIRECTORY_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -d "${!a}" ]] || die "\$${a} (\"${!a}\") not a directory"
done
for a in ${PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES} ; do
+ [[ "${a#build:}" != "${a}" ]] && continue
[[ -e "${!a}" ]] && [[ ! -d "${!a}" ]] && \
die "\$${a} (\"${!a}\") exists but is not a directory"
done