[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200401-36-g47d6f46

[Jon TURNEY]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=47d6f46225c3cecf3afc204a80798c8674059455

commit 47d6f46225c3cecf3afc204a80798c8674059455
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Jun 5 14:28:17 2020 +0100

    Handle ','-separated build-depends: in hint as well

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=3614c2f94f024d8fc7d414ff4a921729453d0f27

commit 3614c2f94f024d8fc7d414ff4a921729453d0f27
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun May 31 22:31:11 2020 +0100

    Bump the minimum setup version
    
    We start to raise the minimum setup version, to hopefully cause people
    to stop using those old versions, in anticipation of dropping signing
    with the key those old version expect.
    
    Unfortunately, this doesn't help with the very old versions which don't
    support setup-minimum-version:. which ~1% of IP activity is still using.


Diff:
---
 calm/hint.py                                  | 5 ++++-
 calm/package.py                               | 2 +-
 test/testdata/inifile/setup.ini.expected      | 2 +-
 test/testdata/process_arch/setup.ini.expected | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/calm/hint.py b/calm/hint.py
index 1256d44..01ef085 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -309,7 +309,10 @@ def hint_file_parse(fn, kind):
                 hints['requires'] = split_trim_sort_join(hints['requires'], None, ' ')
 
             if 'build-depends' in hints:
-                hints['build-depends'] = split_trim_sort_join(hints['build-depends'], None, ', ')
+                if ',' in hints['build-depends']:
+                    hints['build-depends'] = split_trim_sort_join(hints['build-depends'], ',')
+                else:
+                    hints['build-depends'] = split_trim_sort_join(hints['build-depends'], None, ', ')
 
             if 'depends' in hints:
                 hints['depends'] = split_trim_sort_join(hints['depends'], ',')
diff --git a/calm/package.py b/calm/package.py
index 3ad4252..fb60d39 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -980,7 +980,7 @@ def write_setup_ini(args, packages, arch):
             print("include-setup: setup <2.878 not supported", file=f)
 
             # not implemented until 2.890, ignored by earlier versions
-            print("setup-minimum-version: 2.878", file=f)
+            print("setup-minimum-version: 2.891", file=f)
 
             # for setup to check if a setup upgrade is possible
             print("setup-version: %s" % args.setup_version, file=f)
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index 38faf90..4a350c6 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -9,7 +9,7 @@
  'arch: x86\n'
  'setup-timestamp: 1458221800\n'
  'include-setup: setup <2.878 not supported\n'
- 'setup-minimum-version: 2.878\n'
+ 'setup-minimum-version: 2.891\n'
  'setup-version: 4.321\n'
  '\n'
  '@ arc\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index ea487ef..f3d3534 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -9,7 +9,7 @@
  'arch: x86\n'
  'setup-timestamp: 1473797080\n'
  'include-setup: setup <2.878 not supported\n'
- 'setup-minimum-version: 2.878\n'
+ 'setup-minimum-version: 2.891\n'
  'setup-version: 3.1415\n'
  '\n'
  '@ arc\n'