From c030ae76a1441be12f1b19895e3fae3db2175eff Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon, 30 Mar 2020 16:22:58 +0100
Subject: Fix some calm-tool scripts to allow them to be invoked via
 entry-point

---
 calm/fix-missing-src-hint-info.py | 12 ++++++++++--
 calm/fix-missing-src-hint.py      | 13 ++++++++++---
 2 files changed, 20 insertions(+), 5 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())
-- 
cgit v1.2.3