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

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

[Jon TURNEY]

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

commit 90a2c362d9ee8cb0d56da51cac8f6480abad25bf
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Apr 1 12:18:50 2020 +0100

    Update version to 20200401

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

commit c030ae76a1441be12f1b19895e3fae3db2175eff
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Mon Mar 30 16:22:58 2020 +0100

    Fix some calm-tool scripts to allow them to be invoked via entry-point


Diff:
---
 calm/fix-missing-src-hint-info.py | 12 ++++++++++--
 calm/fix-missing-src-hint.py      | 13 ++++++++++---
 setup.py                          |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/calm/fix-missing-src-hint-info.py b/calm/fix-missing-src-hint-info.py
index 44da470..31342ae 100644
--- a/calm/fix-missing-src-hint-info.py
+++ b/calm/fix-missing-src-hint-info.py
@@ -33,7 +33,7 @@ from . import fixes
 
 
 def fix_hints(relarea):
-    for (dirpath, subdirs, files) in os.walk(relarea):
+    for (dirpath, _subdirs, files) in os.walk(relarea):
         for f in files:
             match = re.match(r'^(.*)-src\.tar\.(bz2|gz|lzma|xz)$', f)
             if match:
@@ -49,7 +49,7 @@ def fix_hints(relarea):
 #
 #
 
-if __name__ == "__main__":
+def main():
     relarea_default = common_constants.FTP
 
     parser = argparse.ArgumentParser(description='src hint improver')
@@ -63,3 +63,11 @@ if __name__ == "__main__":
     logging.basicConfig(format=os.path.basename(sys.argv[0]) + ': %(message)s')
 
     fix_hints(args.relarea)
+
+
+#
+#
+#
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/calm/fix-missing-src-hint.py b/calm/fix-missing-src-hint.py
index 46d2f19..ba6f0d7 100644
--- a/calm/fix-missing-src-hint.py
+++ b/calm/fix-missing-src-hint.py
@@ -36,7 +36,7 @@ from . import common_constants
 
 
 def fix_hints(relarea):
-    for (dirpath, subdirs, files) in os.walk(relarea):
+    for (dirpath, _subdirs, files) in os.walk(relarea):
         for f in files:
             match = re.match(r'^(.*)-src\.tar\.(bz2|gz|lzma|xz)$', f)
             if match:
@@ -55,8 +55,7 @@ def fix_hints(relarea):
 #
 #
 
-
-if __name__ == "__main__":
+def main():
     relarea_default = common_constants.FTP
 
     parser = argparse.ArgumentParser(description='src hint creator')
@@ -70,3 +69,11 @@ if __name__ == "__main__":
     logging.basicConfig(format=os.path.basename(sys.argv[0]) + ': %(message)s')
 
     fix_hints(args.relarea)
+
+
+#
+#
+#
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/setup.py b/setup.py
index 177d2b8..1c41c5b 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='calm',
-    version='20200328',
+    version='20200401',
     description='Cygwin packaging maintenance tool',
     long_description=open('README.md').read(),
     author='Jon Turney',