Permalink
Browse files

enterprise.conf: combine with user-specified BBMASK instead of overwr…

…iting it
  • Loading branch information...
kergoth authored and denix0 committed Mar 13, 2009
1 parent 8633d77 commit 5ee794ae6cfb4a831f81d5e4ca56793fa07a1b79
Showing with 3 additions and 1 deletion.
  1. +3 −1 conf/enterprise.conf
View
@@ -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)}"

0 comments on commit 5ee794a

Please sign in to comment.