Hi Good news mostly but some concern on pylint, now.
On Sun, Sep 10, 2017 at 12:00:08AM +0100, Adam D. Barratt wrote: > Control: retitle -1 dch "" should not create maintainer header > Control: tags -1 + patch Title: I agree. Patch: I committed a slightly different patch. Your proposal: > diff --git a/scripts/debchange.pl b/scripts/debchange.pl > index b44b9633..444bb399 100755 > --- a/scripts/debchange.pl > +++ b/scripts/debchange.pl > @@ -1411,7 +1411,7 @@ if (($opt_r || $opt_a || $merge) && ! $opt_create) { > > if (! $opt_r) { > # Add a multi-maintainer header... > - if ($multimaint) { > + if ($multimaint and not $EMPTY_TEXT) { > # ...unless there already is one for this maintainer. > if (!defined $maintline) { > print O "\n [ $MAINTAINER ]\n"; I agree this works for the case I discussed. But looking at the code after it, I decided to make this logic a bit longer to be ion the safe side. df9e22fb ("debchange: update changelog entry correctly", 2017-09-10) > (an alternative would be having the preceding checks skip the block > that potentially sets $multimaint to 1 if $EMPTY_TEXT is set) This may be an option if you think through. But such complicated logic is prone for breakage. I just "or"ed all cases following to cover additional entry is created. My proposal: - if ($multimaint) { + if ($multimaint and + (@closes_text or $TEXT or $opt_news or !$EMPTY_TEXT)) { # ...unless there already is one for this maintainer. if (!defined $maintline) { print O "\n [ $MAINTAINER ]\n"; So far I see no warning related to my changes any more. pylink is still causing warning (python3.5 and python3.6) over crashed and skipped testVgq: | python3.6 setup.py test | running test | running egg_info | creating devscripts.egg-info | writing devscripts.egg-info/PKG-INFO | writing dependency_links to devscripts.egg-info/dependency_links.txt | writing top-level names to devscripts.egg-info/top_level.txt | writing manifest file 'devscripts.egg-info/SOURCES.txt' | reading manifest file 'devscripts.egg-info/SOURCES.txt' | writing manifest file 'devscripts.egg-info/SOURCES.txt' | running build_ext | test_debdiff-apply (devscripts.test.test_help.HelpTestCase) ... /usr/lib/python3.6/unittest/case.py:605: ResourceWarning: unclosed file <_io.BufferedReader name=4> | testMethod() | /usr/lib/python3.6/unittest/case.py:605: ResourceWarning: unclosed file <_io.BufferedReader name=6> | testMethod() | ok | test_reproducible-check (devscripts.test.test_help.HelpTestCase) ... ok | test_sadt (devscripts.test.test_help.HelpTestCase) ... ok | test_suspicious-source (devscripts.test.test_help.HelpTestCase) ... ok | test_wrap-and-sort (devscripts.test.test_help.HelpTestCase) ... ok | testArgs (devscripts.test.test_logger.LoggerTestCase) ... ok | testCommand (devscripts.test.test_logger.LoggerTestCase) ... ok | testNoArgs (devscripts.test.test_logger.LoggerTestCase) ... ok | test_pylint (devscripts.test.test_pylint.PylintTestCase) | Test: Run pylint on Python source code ... skipped 'pylint crashed :/' | | ---------------------------------------------------------------------- | Ran 9 tests in 0.475s | | OK (skipped=1) | python3.5 setup.py test | running test | running egg_info | writing devscripts.egg-info/PKG-INFO | writing top-level names to devscripts.egg-info/top_level.txt | writing dependency_links to devscripts.egg-info/dependency_links.txt | reading manifest file 'devscripts.egg-info/SOURCES.txt' | writing manifest file 'devscripts.egg-info/SOURCES.txt' | running build_ext | test_debdiff-apply (devscripts.test.test_help.HelpTestCase) ... /usr/lib/python3.5/unittest/case.py:605: ResourceWarning: unclosed file <_io.BufferedReader name=6> | testMethod() | /usr/lib/python3.5/unittest/case.py:605: ResourceWarning: unclosed file <_io.BufferedReader name=4> | testMethod() | ok | test_reproducible-check (devscripts.test.test_help.HelpTestCase) ... ok | test_sadt (devscripts.test.test_help.HelpTestCase) ... ok | test_suspicious-source (devscripts.test.test_help.HelpTestCase) ... ok | test_wrap-and-sort (devscripts.test.test_help.HelpTestCase) ... ok | testArgs (devscripts.test.test_logger.LoggerTestCase) ... ok | testCommand (devscripts.test.test_logger.LoggerTestCase) ... ok | testNoArgs (devscripts.test.test_logger.LoggerTestCase) ... ok | test_pylint (devscripts.test.test_pylint.PylintTestCase) | Test: Run pylint on Python source code ... skipped 'pylint crashed :/' | | ---------------------------------------------------------------------- | Ran 9 tests in 0.467s | | OK (skipped=1) Regards, Osamu _______________________________________________ devscripts-devel mailing list devscripts-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel