saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updates after reviewer comments

Browse source
This commit is contained in:
David Murphy 2024-05-13 09:46:50 -06:00 • committed by Daniel Wozniak
parent 55fa8cee80
commit af5a485793
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/platform.py
View file

@ -13,8 +13,6 @@ import distro
from salt.utils.decorators import memoize as real_memoize from salt.utils.decorators import memoize as real_memoize
## from salt.utils.files import fopen as _fopen
def linux_distribution(full_distribution_name=True): def linux_distribution(full_distribution_name=True):
""" """
@ -255,7 +253,6 @@ def get_machine_identifier():
if not existing_locations: if not existing_locations:
return {} return {}
else: else:
## with _fopen(existing_locations[0]) as machineid:
# cannot use salt.utils.files.fopen due to circular dependency # cannot use salt.utils.files.fopen due to circular dependency
with open( with open(
existing_locations[0], encoding=__salt_system_encoding__ existing_locations[0], encoding=__salt_system_encoding__

4
salt/utils/process.py
View file

@ -13,6 +13,7 @@ import logging
import multiprocessing import multiprocessing
import multiprocessing.util import multiprocessing.util
import os import os
import pathlib
import queue import queue
import shutil import shutil
import signal import signal
@ -21,7 +22,6 @@ import subprocess
import sys import sys
import threading import threading
import time import time
from pathlib import Path
import salt._logging import salt._logging
import salt.defaults.exitcodes import salt.defaults.exitcodes
@ -1106,7 +1106,7 @@ class SignalHandlingProcess(Process):
if cache_dir and gitfs_active: if cache_dir and gitfs_active:
# check for gitfs file locks to ensure no resource leaks # check for gitfs file locks to ensure no resource leaks
# last chance to clean up any missed unlock droppings # last chance to clean up any missed unlock droppings
cache_dir = Path(cache_dir + "/gitfs/work") cache_dir = pathlib.Path(cache_dir + "/gitfs/work")
if cache_dir.exists and cache_dir.is_dir(): if cache_dir.exists and cache_dir.is_dir():
file_list = list(cache_dir.glob("**/*.lk")) file_list = list(cache_dir.glob("**/*.lk"))
file_del_list = [] file_del_list = []

2
tests/pytests/unit/utils/test_gitfs_locks.py
View file

@ -28,7 +28,7 @@ try:
except ImportError: except ImportError:
import salt.utils.win_functions import salt.utils.win_functions
pytestmark = [pytest.mark.skip_unless_on_linux] pytestmark = [pytest.mark.skip_on_windows]
log = logging.getLogger(__name__) log = logging.getLogger(__name__)