untest failing with TypeError: add_packages() got an unexpected keyword argument 'trustedMaint'

[Brian Inglis]

On 2023-01-21 16:57, Brian Inglis via Cygwin-apps wrote:
> $ ssh cygwin untest dash-0.5.12-1
> Traceback (most recent call last):
>    File "/usr/lib64/python3.6/runpy.py", line 193, in _run_module_as_main
>      "__main__", mod_spec)
>    File "/usr/lib64/python3.6/runpy.py", line 85, in _run_code
>      exec(code, run_globals)
>    File "/sourceware/cygwin-staging/calm/calm/untest.py", line 83, in <module>
>      sys.exit(main())
>    File "/sourceware/cygwin-staging/calm/calm/untest.py", line 79, in main
>      untest(p)
>    File "/sourceware/cygwin-staging/calm/calm/untest.py", line 39, in untest
>      if not tool_util.permitted(p):
>    File "/sourceware/cygwin-staging/calm/calm/tool_util.py", line 50, in permitted
>      mlist = maintainers.add_packages(mlist, common_constants.PKGMAINT, 
> trustedMaint=common_constants.TRUSTEDMAINT)
> TypeError: add_packages() got an unexpected keyword argument 'trustedMaint'

Allowed keyword arguments were only orphanMaint and prev_maint:

$ grep -H add_packages /usr/lib/python3.?/site-packages/**/maintainers*
/usr/lib/python3.9/site-packages/calm/maintainers.py:def add_packages(mlist, 
pkglist, orphanMaint=None, prev_maint=True):
/usr/lib/python3.9/site-packages/calm/maintainers.py:    mlist = 
add_packages(mlist, args.pkglist, orphanmaint, prev_maint)

Commit ad6b47c27b1113abacdfebf7234d38b6524606cd

https://cygwin.com/git/?p=cygwin-apps/calm.git;a=commitdiff;h=ad6b47c27b1113abacdfebf7234d38b6524606cd

removes orphanMaint but does not add trustedMaint in def:

https://cygwin.com/git/?p=cygwin-apps%2Fcalm.git&a=search&h=HEAD&st=grep&s=add_packages

calm/maintainers.py	
  139 def add_packages(mlist, pkglist, prev_maint=True):
  201     mlist = add_packages(mlist, args.pkglist, prev_maint)
calm/mkgitoliteconf.py	
   54     mlist = maintainers.add_packages(mlist, args.pkglist)
calm/package.py	
1091     mlist = maintainers.add_packages(mlist, args.pkglist)
calm/tool_util.py	
   50     mlist = maintainers.add_packages(mlist, common_constants.PKGMAINT, 
trustedMaint=common_constants.TRUSTEDMAINT)
test/test_calm.py	
  322         mlist = maintainers.add_packages(mlist, 
'testdata/pkglist/cygwin-pkg-maint')

Newer version not pushed, built, or installed on site?

-- 
Take care. Thanks, Brian Inglis			Calgary, Alberta, Canada

La perfection est atteinte			Perfection is achieved
non pas lorsqu'il n'y a plus rien à ajouter	not when there is no more to add
mais lorsqu'il n'y a plus rien à retirer	but when there is no more to cut
			-- Antoine de Saint-Exupéry