diff options
| author | Günther Deschner <gd@samba.org> | 2011-03-15 22:51:58 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-03-15 23:38:43 +0100 |
| commit | 5e3da3fc50e7cb47c557be92b03456ded9a8435a (patch) | |
| tree | 943532e3a74b436677b244120e5ea91d02596ffe | |
| parent | c287351d0553dec62f1929f46e3c34278317b2a4 (diff) | |
| download | samba-5e3da3fc50e7cb47c557be92b03456ded9a8435a.tar.gz samba-5e3da3fc50e7cb47c557be92b03456ded9a8435a.tar.bz2 samba-5e3da3fc50e7cb47c557be92b03456ded9a8435a.zip | |
s3-build: try to silence annoying "Ignoring invalid value 'vlp' for parameter 'printing'"
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
| -rw-r--r-- | source3/param/loadparm.c | 5 | ||||
| -rw-r--r-- | source3/wscript | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 245c60a07a..3314ad26ca 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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"); diff --git a/source3/wscript b/source3/wscript index 86af6b38c1..508f270039 100644 --- a/source3/wscript +++ b/source3/wscript @@ -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): |