Fix variable name clash

bulletmark · bulletmark · commit a4ff48c46fc3 · 2022-08-07T15:23:27.000+10:00
Program was setting wrong "who"string in `systemd-inhibit --list`
output.
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name=name,
-    version='1.13',
+    version='1.14',
     description='Program to run plugins to inhibit system '
     'sleep/suspend/hibernate',
     long_description=here.joinpath('README.md').read_text(),
diff --git a/sleep_inhibitor.py b/sleep_inhibitor.py
@@ -30,7 +30,7 @@ class Plugin:
     loglock = threading.Lock()
     threads = []
 
-    def __init__(self, index, prog, name, conf, plugin_dir, inhibitor_prog):
+    def __init__(self, index, prog, progname, conf, plugin_dir, inhibitor_prog):
         'Constructor'
         pathstr = conf.get('path')
         if not pathstr:
@@ -69,7 +69,7 @@ def __init__(self, index, prog, name, conf, plugin_dir, inhibitor_prog):
         # While inhibiting, we run outself again via systemd-inhibit to
         # run the plugin in a loop which keeps the inhibit on while the
         # inhibit state is returned.
-        self.icmd = shlex.split(f'{inhibitor_prog}{what} --who="{name}" '
+        self.icmd = shlex.split(f'{inhibitor_prog}{what} --who="{progname}" '
                 f'--why="{self.name}" {prog} -s {self.period} -i "{cmd}"')
 
         print(f'{self.name} [{path}] configured @ {period} minutes')
@@ -137,7 +137,7 @@ def init():
                 sys.exit(res.returncode)
 
     prog = Path(sys.argv[0]).resolve()
-    name = prog.stem.replace('_', '-')
+    progname = prog.stem.replace('_', '-')
 
     # Work out what sleep inhibitor program to use
     inhibitor_prog = None
@@ -150,29 +150,28 @@ def init():
             continue
 
         vers = res.stdout.split('\n')[0].strip()
-        print(f'{name} using {iprog}, {vers}')
+        print(f'{progname} using {iprog}, {vers}')
         inhibitor_prog = iprog
 
     if not inhibitor_prog:
         opts = ' or '.join(SYSTEMD_SLEEP_PROGS)
         sys.exit(f'No systemd-inhibitor app installed from one of {opts}.')
 
     # Work out plugin and base dirs for this installation
-    plugin_dir = Path(sys.prefix) / 'share' / name / 'plugins'
+    plugin_dir = Path(sys.prefix) / 'share' / progname / 'plugins'
     if plugin_dir.exists():
         base_dir = plugin_dir.parent
     else:
         plugin_dir = None
         base_dir = None
 
     # Determine config file path
-    cname = name + '.conf'
+    cname = progname + '.conf'
     cfile = Path(args.config).expanduser() if args.config else \
             Path(f'/etc/{cname}')
 
     if not cfile.exists():
-        print(f'{name} configuration file {cfile} does not exist.',
-                file=sys.stderr)
+        print(f'Configuration file {cfile} does not exist.', file=sys.stderr)
         if base_dir and not args.config:
             print(f'Copy {base_dir}/{cname} to /etc and edit appropriately.',
                     file=sys.stderr)
@@ -190,7 +189,7 @@ def init():
 
     # Iterate to create each configured plugins
     for index, plugin in enumerate(plugins, 1):
-        Plugin(index, prog, name, plugin, plugin_dir, inhibitor_prog)
+        Plugin(index, prog, progname, plugin, plugin_dir, inhibitor_prog)
 
 def main():
     'Main entry'
