diff --git a/rpmlint/checks/AppDataCheck.py b/rpmlint/checks/AppDataCheck.py index 26a65d24..63edc967 100644 --- a/rpmlint/checks/AppDataCheck.py +++ b/rpmlint/checks/AppDataCheck.py @@ -2,7 +2,7 @@ import subprocess from xml.etree import ElementTree from rpmlint.checks.AbstractCheck import AbstractFilesCheck -from rpmlint.helpers import ENGLISH_ENVIROMENT +from rpmlint.helpers import ENGLISH_ENVIRONMENT class AppDataCheck(AbstractFilesCheck): @@ -23,7 +23,7 @@ class AppDataCheck(AbstractFilesCheck): validation_failed = False try: - r = subprocess.run(cmd.split(), env=ENGLISH_ENVIROMENT, + r = subprocess.run(cmd.split(), env=ENGLISH_ENVIRONMENT, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) if r.returncode != 0: validation_failed = True diff --git a/rpmlint/checks/BashismsCheck.py b/rpmlint/checks/BashismsCheck.py index 1e0b3a7f..45f0bd9c 100644 --- a/rpmlint/checks/BashismsCheck.py +++ b/rpmlint/checks/BashismsCheck.py @@ -2,7 +2,7 @@ import stat import subprocess from rpmlint.checks.AbstractCheck import AbstractFilesCheck -from rpmlint.helpers import ENGLISH_ENVIROMENT +from rpmlint.helpers import ENGLISH_ENVIRONMENT class BashismsCheck(AbstractFilesCheck): @@ -52,7 +52,7 @@ class BashismsCheck(AbstractFilesCheck): try: r = subprocess.run(['dash', '-n', filepath], stderr=subprocess.DEVNULL, - env=ENGLISH_ENVIROMENT) + env=ENGLISH_ENVIRONMENT) if r.returncode == 2: yield 'bin-sh-syntax-error' elif r.returncode == 127: @@ -67,7 +67,7 @@ class BashismsCheck(AbstractFilesCheck): cmd.append('-e') r = subprocess.run(cmd, stderr=subprocess.DEVNULL, - env=ENGLISH_ENVIROMENT) + env=ENGLISH_ENVIRONMENT) if r.returncode == 1: yield 'potential-bashisms' elif r.returncode == 2: diff --git a/rpmlint/checks/MenuCheck.py b/rpmlint/checks/MenuCheck.py index 9a8da748..e8b7d4e6 100644 --- a/rpmlint/checks/MenuCheck.py +++ b/rpmlint/checks/MenuCheck.py @@ -12,7 +12,7 @@ import subprocess import rpm from rpmlint.checks.AbstractCheck import AbstractCheck -from rpmlint.helpers import ENGLISH_ENVIROMENT +from rpmlint.helpers import ENGLISH_ENVIRONMENT menu_file_regex = re.compile(r'^/usr/lib/menu/([^/]+)$') @@ -94,7 +94,7 @@ class MenuCheck(AbstractCheck): directory = pkg.dir_name() for f in menus: # remove comments and handle cpp continuation lines - text = subprocess.run(('/lib/cpp', directory + f), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=ENGLISH_ENVIROMENT, text=True).stdout + text = subprocess.run(('/lib/cpp', directory + f), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=ENGLISH_ENVIRONMENT, text=True).stdout if text.endswith('\n'): text = text[:-1] diff --git a/rpmlint/checks/MenuXDGCheck.py b/rpmlint/checks/MenuXDGCheck.py index 5b71056d..44c3af64 100644 --- a/rpmlint/checks/MenuXDGCheck.py +++ b/rpmlint/checks/MenuXDGCheck.py @@ -10,7 +10,7 @@ from pathlib import Path import subprocess from rpmlint.checks.AbstractCheck import AbstractFilesCheck -from rpmlint.helpers import ENGLISH_ENVIROMENT +from rpmlint.helpers import ENGLISH_ENVIRONMENT STANDARD_BIN_DIRS = ('/bin', '/sbin', '/usr/bin', '/usr/sbin') @@ -45,7 +45,7 @@ class MenuXDGCheck(AbstractFilesCheck): f = root + filename try: command = subprocess.run(('desktop-file-validate', f), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, - env=ENGLISH_ENVIROMENT, text=True) + env=ENGLISH_ENVIRONMENT, text=True) text = command.stdout if command.returncode: error_printed = False diff --git a/rpmlint/checks/PostCheck.py b/rpmlint/checks/PostCheck.py index 81da9b6c..f6aca014 100644 --- a/rpmlint/checks/PostCheck.py +++ b/rpmlint/checks/PostCheck.py @@ -15,7 +15,7 @@ import tempfile import rpm from rpmlint import pkg as Pkg from rpmlint.checks.AbstractCheck import AbstractCheck -from rpmlint.helpers import byte_to_string, ENGLISH_ENVIROMENT +from rpmlint.helpers import byte_to_string, ENGLISH_ENVIRONMENT # shells that grok the -n switch for debugging @@ -63,7 +63,7 @@ def check_syntax_script(prog, commandline, script): try: tmpfile.write(script) tmpfile.close() - ret = subprocess.run((prog, commandline, tmpname), env=ENGLISH_ENVIROMENT) + ret = subprocess.run((prog, commandline, tmpname), env=ENGLISH_ENVIRONMENT) finally: tmpfile.close() os.remove(tmpname) diff --git a/rpmlint/checks/SpecCheck.py b/rpmlint/checks/SpecCheck.py index 396fd74d..28be00ed 100644 --- a/rpmlint/checks/SpecCheck.py +++ b/rpmlint/checks/SpecCheck.py @@ -6,7 +6,7 @@ from urllib.parse import urlparse import rpm from rpmlint import pkg as Pkg from rpmlint.checks.AbstractCheck import AbstractCheck -from rpmlint.helpers import ENGLISH_ENVIROMENT, readlines +from rpmlint.helpers import ENGLISH_ENVIRONMENT, readlines # Don't check for hardcoded library paths in biarch packages DEFAULT_BIARCH_PACKAGES = '^(gcc|glibc)' @@ -304,7 +304,7 @@ class SpecCheck(AbstractCheck): try: outcmd = subprocess.run( ('rpm', '-q', '--qf=', '-D', '_sourcedir %s' % self._spec_file_dir, - '--specfile', self._spec_file), stderr=subprocess.PIPE, encoding='utf8', env=ENGLISH_ENVIROMENT) + '--specfile', self._spec_file), stderr=subprocess.PIPE, encoding='utf8', env=ENGLISH_ENVIRONMENT) for line in outcmd.stderr.splitlines(): line = line.strip() diff --git a/rpmlint/lddparser.py b/rpmlint/lddparser.py index 9c9be8aa..81d1d1dd 100644 --- a/rpmlint/lddparser.py +++ b/rpmlint/lddparser.py @@ -50,7 +50,7 @@ class LddParser: def parse_dependencies(self): r = subprocess.run(['ldd', '-u', self.pkgfile_path], encoding='utf8', - capture_output=True, env=ENGLISH_ENVIROMENT) + capture_output=True, env=ENGLISH_ENVIRONMENT) if r.returncode == 0: return @@ -68,7 +68,7 @@ class LddParser: def parse_undefined_symbols(self): r = subprocess.run(['ldd', '-r', self.pkgfile_path], encoding='utf8', - capture_output=True, env=ENGLISH_ENVIROMENT) + capture_output=True, env=ENGLISH_ENVIRONMENT) # here ldd should always return 0 if r.returncode != 0: self.parsing_failed_reason = r.stderr @@ -85,7 +85,7 @@ class LddParser: # run c++filt demangler for all collected symbols if self.undefined_symbols: r = subprocess.run(['c++filt'] + self.undefined_symbols, encoding='utf8', - capture_output=True, env=ENGLISH_ENVIROMENT) + capture_output=True, env=ENGLISH_ENVIRONMENT) if r.returncode != 0: self.parsing_failed_reason = r.stderr else: