From: Noel Power <noel.power@suse.com>
Date: Thu, 8 May 2025 19:26:33 +0000 (+0100)
Subject: wafsamba: Adjust for waf 2.1.5 wafsamba_options_parse_cmd_args return
X-Git-Tag: tevent-0.17.0~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8bf7f501cd9d808a0a2602a3689aaba5d09db31;p=thirdparty%2Fsamba.git

wafsamba: Adjust for waf 2.1.5 wafsamba_options_parse_cmd_args return

return 2 item tuple to match waf 2.1.5 version of
Options.OptionsContext.parse_cmd_args

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index e45f0ae1a35..1776fcee965 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -502,7 +502,7 @@ def CHECK_MAKEFLAGS(options):
 
 waflib_options_parse_cmd_args = Options.OptionsContext.parse_cmd_args
 def wafsamba_options_parse_cmd_args(self, _args=None, cwd=None, allow_unknown=False):
-    (options, commands, envvars) = \
+    (options, leftover_args) = \
         waflib_options_parse_cmd_args(self,
                                       _args=_args,
                                       cwd=cwd,
@@ -526,7 +526,7 @@ def wafsamba_options_parse_cmd_args(self, _args=None, cwd=None, allow_unknown=Fa
                 return
         from waflib import Runner
         Runner.Spawner = NoOpSpawner
-    return options, commands, envvars
+    return options, leftover_args
 Options.OptionsContext.parse_cmd_args = wafsamba_options_parse_cmd_args
 
 option_groups = {}