[PATCH] fix --disable-python

Philipp Gesang philipp.gesang at intra2net.com
Thu Sep 19 07:48:04 UTC 2019


Hey,

while packaging 4.11 I noticed that the samba-gpupdate script
would end up being installed despite --disable-python. Attached
is a patch that fixes this.

FWIW the CI run:
https://gitlab.com/samba-team/devel/samba/pipelines/83109693

Thank you,
Philipp
-------------- next part --------------
From 6d338d516077a34fd39321a830f1f7eab89caec1 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <philipp.gesang at intra2net.com>
Date: Thu, 19 Sep 2019 09:03:45 +0200
Subject: [PATCH] s4:scripting: make samba-gpupdate heed --disable-python

Signed-off-by: Philipp Gesang <philipp.gesang at intra2net.com>
---
 source4/scripting/wscript_build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 31c395d3e4b..c5883f1fc8c 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -5,8 +5,9 @@ from samba_utils import MODE_755
 sbin_files = ''
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
     sbin_files = 'bin/samba_downgrade_db bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
-sbin_files += 'bin/samba-gpupdate'
-man_files = 'man/samba-gpupdate.8'
+if not bld.env.disable_python:
+    sbin_files += 'bin/samba-gpupdate'
+    man_files = 'man/samba-gpupdate.8'
 
 if sbin_files:
     bld.INSTALL_FILES('${SBINDIR}',
-- 
2.21.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20190919/28a302c4/signature.sig>


More information about the samba-technical mailing list