[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Feb 2 21:16:01 UTC 2023


The branch, master has been updated
       via  851127f5c9a Python: remove pydoctor
       via  1dd0cd2f4e6 mdssvc: fix kMDScopeArray parsing
      from  d80f28b081e tevent: version 0.14.1

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 851127f5c9a56cb484008f3595099cbd9728b8c7
Author: Rob van der Linde <rob at catalyst.net.nz>
Date:   Mon Jan 30 16:32:47 2023 +1300

    Python: remove pydoctor
    
    Removes:
    
    * waf pydoctor
    * waf wafdocs
    * make pydoctor
    
    There is no "make wafdocs" it only appears to be in wscript.
    
    The reasoning being is these are broken and appear to not have been run for some time.
    
    Signed-off-by: Rob van der Linde <rob at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Feb  2 21:15:54 UTC 2023 on atb-devel-224

commit 1dd0cd2f4e644ad43b0e7ee2aaae19799e859585
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Jan 18 16:21:16 2023 +0100

    mdssvc: fix kMDScopeArray parsing
    
    In macOS Ventura marshalling of kMDScopeArray in the "openQueryWithParams"
    request has changed from
    
      string: kMDScopeArray
      sl_array_t(#1): {
        string: /foo/bar
      }
    
    to:
    
      string: kMDScopeArray
      sl_array_t(#1): {
        sl_array_t(#1): {
          string: /foo/bar
        }
      }
    
    With this patch we check both encodings. Bug fixed according to user feedback.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15299
    RN: Spotlight doesn't work with latest macOS Ventura
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile                           |  3 ---
 ctdb/Makefile                      |  3 ---
 lib/talloc/Makefile                |  3 ---
 lib/talloc/wscript                 |  7 -------
 lib/tdb/Makefile                   |  3 ---
 source3/rpc_server/mdssvc/mdssvc.c |  6 ++++++
 wscript                            | 37 -------------------------------------
 7 files changed, 6 insertions(+), 56 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile b/Makefile
index 7f5960d5191..ec571050a09 100644
--- a/Makefile
+++ b/Makefile
@@ -97,9 +97,6 @@ etags:
 ctags:
 	$(WAF) ctags
 
-pydoctor:
-	$(WAF) pydoctor
-
 pep8:
 	$(WAF) pep8
 
diff --git a/ctdb/Makefile b/ctdb/Makefile
index 5dbc7acdc54..94113fe3adf 100644
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -75,9 +75,6 @@ ctags:
 	touch .tmplock
 	WAFLOCK=.tmplock $(WAF) ctags
 
-pydoctor:
-	$(WAF) pydoctor
-
 bin/%:: FORCE
 	$(WAF) --targets=`basename $@`
 FORCE:
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index db2275c7397..ff8e585f2a9 100644
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -60,9 +60,6 @@ etags:
 ctags:
 	$(WAF) ctags
 
-pydoctor:
-	$(WAF) pydoctor
-
 bin/%:: FORCE
 	$(WAF) --targets=`basename $@`
 FORCE:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 1c54a7c653a..503295eeceb 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -190,10 +190,3 @@ def dist():
 def reconfigure(ctx):
     '''reconfigure if config scripts have changed'''
     samba_utils.reconfigure(ctx)
-
-
-def pydoctor(ctx):
-    '''build python apidocs'''
-    cmd='PYTHONPATH=bin/python pydoctor --project-name=talloc --project-url=http://talloc.samba.org/ --make-html --docformat=restructuredtext --introspect-c-modules --add-module bin/python/talloc.*'
-    print("Running: %s" % cmd)
-    os.system(cmd)
diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile
index 8fd56c814ec..55e229bcbf1 100644
--- a/lib/tdb/Makefile
+++ b/lib/tdb/Makefile
@@ -60,9 +60,6 @@ etags:
 ctags:
 	$(WAF) ctags
 
-pydoctor:
-	$(WAF) pydoctor
-
 bin/%:: FORCE
 	$(WAF) --targets=`basename $@`
 FORCE:
diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
index 01713722126..9b32c99b8b3 100644
--- a/source3/rpc_server/mdssvc/mdssvc.c
+++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -919,6 +919,12 @@ static bool slrpc_open_query(struct mds_ctx *mds_ctx,
 
 	scope = dalloc_get(path_scope, "char *", 0);
 	if (scope == NULL) {
+		scope = dalloc_get(path_scope,
+				   "DALLOC_CTX", 0,
+				   "char *", 0);
+	}
+	if (scope == NULL) {
+		DBG_ERR("Failed to parse kMDScopeArray\n");
 		goto error;
 	}
 
diff --git a/wscript b/wscript
index 08995fbe4ec..7396e09c294 100644
--- a/wscript
+++ b/wscript
@@ -465,28 +465,6 @@ def build(bld):
     samba_version.load_version(env=bld.env, is_install=bld.is_install)
 
 
-def pydoctor(ctx):
-    '''build python apidocs'''
-    bp = os.path.abspath('bin/python')
-    mpaths = {}
-    modules = ['talloc', 'tdb', 'ldb']
-    for m in modules:
-        f = os.popen("PYTHONPATH=%s python -c 'import %s; print %s.__file__'" % (bp, m, m), 'r')
-        try:
-            mpaths[m] = f.read().strip()
-        finally:
-            f.close()
-    mpaths['main'] = bp
-    cmd = ('PYTHONPATH=%(main)s pydoctor --introspect-c-modules --project-name=Samba '
-           '--project-url=http://www.samba.org --make-html --docformat=restructuredtext '
-           '--add-package bin/python/samba ' + ''.join('--add-module %s ' % n for n in modules))
-    cmd = cmd % mpaths
-    print("Running: %s" % cmd)
-    status = os.system(cmd)
-    if os.WEXITSTATUS(status):
-        raise Errors.WafError('pydoctor failed')
-
-
 def pep8(ctx):
     '''run pep8 validator'''
     cmd='PYTHONPATH=bin/python pep8 -r bin/python/samba'
@@ -496,21 +474,6 @@ def pep8(ctx):
         raise Errors.WafError('pep8 failed')
 
 
-def wafdocs(ctx):
-    '''build wafsamba apidocs'''
-    from samba_utils import recursive_dirlist
-    os.system('pwd')
-    list = recursive_dirlist('../buildtools/wafsamba', '.', pattern='*.py')
-
-    print(list)
-    cmd='PYTHONPATH=bin/python pydoctor --project-name=wafsamba --project-url=http://www.samba.org --make-html --docformat=restructuredtext' +\
-        "".join(' --add-module %s' % f for f in list)
-    print("Running: %s" % cmd)
-    status = os.system(cmd)
-    if os.WEXITSTATUS(status):
-        raise Errors.WafError('wafdocs failed')
-
-
 def dist():
     '''makes a tarball for distribution'''
     sambaversion = samba_version.load_version(env=None)


-- 
Samba Shared Repository



More information about the samba-cvs mailing list