summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-01-15 14:13:46 +0000
committerUlrich Müller <ulm@gentoo.org>2012-01-15 14:13:46 +0000
commitfcdb79467ec4a2da62157d953b3f2d877bb9b46e (patch)
tree343b6ab543b64808c9d87b5201480daa871223dd /eclass
parentEmpty py-compile script instead of symlinking it to /path/to/true for automak... (diff)
downloadhistorical-fcdb79467ec4a2da62157d953b3f2d877bb9b46e.tar.gz
historical-fcdb79467ec4a2da62157d953b3f2d877bb9b46e.tar.bz2
historical-fcdb79467ec4a2da62157d953b3f2d877bb9b46e.zip
New variable CDROM_DISABLE_PROPERTIES. Set PROPERTIES only if this is unset.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/cdrom.eclass12
2 files changed, 15 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 99dc57058c07..e92db66ad013 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.86 2012/01/15 14:05:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.87 2012/01/15 14:13:46 ulm Exp $
+
+ 15 Jan 2012; Ulrich Müller <ulm@gentoo.org> cdrom.eclass:
+ New variable CDROM_DISABLE_PROPERTIES. Set PROPERTIES only if this is unset.
15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Pass --docdir to configure only when supported.
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index d2b9d4e1d9d5..94eda0815073 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.2 2012/01/13 22:35:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cdrom.eclass,v 1.3 2012/01/15 14:13:46 ulm Exp $
# @ECLASS: cdrom.eclass
# @MAINTAINER:
@@ -20,6 +20,16 @@ ___ECLASS_ONCE_CDROM=1
inherit portability
+# @ECLASS-VARIABLE: CDROM_DISABLE_PROPERTIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# By default, the eclass sets PROPERTIES="interactive".
+# A non-empty value of CDROM_DISABLE_PROPERTIES suppresses this.
+
+if [[ -z ${CDROM_DISABLE_PROPERTIES} ]]; then
+ PROPERTIES="interactive"
+fi
+
# @FUNCTION: cdrom_get_cds
# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
# @DESCRIPTION: