From 5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 13 Mar 2009 12:36:41 -0400
Subject: enterprise.conf: combine with user-specified BBMASK instead of
 overwriting it

---
 conf/enterprise.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index a1e0d70691..035abe611b 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +1,4 @@
 # For the enterprise edition we want to avoid certain packages by default.
-BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '', d)}"
+BBMASK ?= ""
+OLDBBMASK := "${BBMASK}"
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', base_conditional('OLDBBMASK', '', '', '(${OLDBBMASK})|', d) + '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '${OLDBBMASK}', d)}"
-- 
cgit 1.2.3-korg