sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-build: try to silence annoying "Ignoring invalid value 'vlp' for parameter 'printing'"

Browse Source 
warning on the buildfarm.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue Mar 15 23:38:43 CET 2011 on sn-devel-104
This commit is contained in:
Günther Deschner 2011-03-15 22:51:58 +01:00
parent c287351d05
commit 5e3da3fc50
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/param/loadparm.c
View File

@ -749,7 +749,7 @@ static const struct enum_list enum_printing[] = {
{PRINT_IPRINT, "iprint"},
{PRINT_LPRNT, "nt"},
{PRINT_LPROS2, "os2"},
#ifdef DEVELOPER
#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
{PRINT_TEST, "test"},
{PRINT_VLP, "vlp"},
#endif /* DEVELOPER */
@ -4857,7 +4857,8 @@ static void init_printer_values(struct service *pService)
string_set(&pService->szPrintcommand, "lp -r -P%p %s");
break;
#ifdef DEVELOPER
#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
case PRINT_TEST:
case PRINT_VLP:
string_set(&pService->szPrintcommand, "vlp print %p %s");

6
source3/wscript
View File

@ -1292,9 +1292,9 @@ main() {
msg='Checking for ftruncate extend',
addmain=False,
execute=True)
if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
conf.define('ENABLE_BUILD_FARM_HACKS', '1')
if os.getenv('RUN_FROM_BUILD_FARM'):
Logs.info("enabling buildfarm hacks")
conf.DEFINE('ENABLE_BUILD_FARM_HACKS', '1')
if Options.options.with_sendfile_support:
if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1):