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

Allow slash '/' in git branch names and traverse git branches using os.walk

Browse source
This commit is contained in:
David Murphy 2025-02-14 13:37:51 -07:00 • committed by Daniel Wozniak
parent e120c04617
commit 1d4c12ec3b
2 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/67733.fixed.md Normal file
View file

@ -0,0 +1 @@
Use os.walk to traverse git branches, and no longer replace slash '/' in git branch names

47
salt/utils/gitfs.py
View file

@ -491,9 +491,6 @@ class GitProvider:
self._cache_basename = "_" self._cache_basename = "_"
if self.id.startswith("__env__"): if self.id.startswith("__env__"):
try: try:
## DGM self._cache_basename = self.get_checkout_target().replace(
## DGM "/", "-"
## DGM ) # replace '/' with '-' to not cause trouble with file-system
self._cache_basename = self.get_checkout_target() self._cache_basename = self.get_checkout_target()
except AttributeError: except AttributeError:
@ -2799,64 +2796,22 @@ class GitBase:
name = getattr(repo, "name", None) name = getattr(repo, "name", None)
if not remotes or (repo.id, name) in remotes or name in remotes: if not remotes or (repo.id, name) in remotes or name in remotes:
try: try:
## DGM # Find and place fetch_request file for all the other branches for this repo
## DGM repo_work_hash = os.path.split(repo.get_salt_working_dir())[0]
## DGM for branch in os.listdir(repo_work_hash):
## DGM # Don't place fetch request in current branch being updated
## DGM if branch == repo.get_cache_basename():
## DGM continue
## DGM branch_salt_dir = salt.utils.path.join(repo_work_hash, branch)
## DGM fetch_path = salt.utils.path.join(
## DGM branch_salt_dir, "fetch_request"
## DGM )
## DGM if os.path.isdir(branch_salt_dir):
## DGM try:
## DGM with salt.utils.files.fopen(fetch_path, "w"):
## DGM pass
## DGM except OSError as exc: # pylint: disable=broad-except
## DGM log.error(
## DGM "Failed to make fetch request: %s %s",
## DGM fetch_path,
## DGM exc,
## DGM exc_info=True,
## DGM )
## DGM else:
## DGM log.error("Failed to make fetch request: %s", fetch_path)
# Find and place fetch_request file for all the other branches for this repo # Find and place fetch_request file for all the other branches for this repo
repo_work_hash = os.path.split(repo.get_salt_working_dir())[0] repo_work_hash = os.path.split(repo.get_salt_working_dir())[0]
print(
f"DGM class GitBase fetch_remotes, repo_work_hash '{repo_work_hash}', salt working dir '{repo.get_salt_working_dir()}'",
flush=True,
)
branches = [ branches = [
os.path.relpath(path, repo_work_hash) os.path.relpath(path, repo_work_hash)
for (path, subdirs, files) in os.walk(repo_work_hash) for (path, subdirs, files) in os.walk(repo_work_hash)
if not subdirs if not subdirs
] ]
print(
f"DGM class GitBase fetch_remotes, branches '{branches}' from repo_work_hash '{repo_work_hash}'",
flush=True,
)
## DGM for branch in os.listdir(repo_work_hash): for branch in branches:
for branch in os.listdir(branches):
# Don't place fetch request in current branch being updated # Don't place fetch request in current branch being updated
print(
f"DGM class GitBase fetch_remotes, for loop branch, branch '{branch}', repo get_cache_basename '{repo.get_cache_basename()}'",
flush=True,
)
if branch == repo.get_cache_basename(): if branch == repo.get_cache_basename():
continue continue
branch_salt_dir = salt.utils.path.join(repo_work_hash, branch) branch_salt_dir = salt.utils.path.join(repo_work_hash, branch)
fetch_path = salt.utils.path.join( fetch_path = salt.utils.path.join(
branch_salt_dir, "fetch_request" branch_salt_dir, "fetch_request"
) )
print(
f"DGM class GitBase fetch_remotes, for loop branch, branch_salt_dir '{branch_salt_dir}', fetch_path '{fetch_path}'",
flush=True,
)
if os.path.isdir(branch_salt_dir): if os.path.isdir(branch_salt_dir):
try: try:
with salt.utils.files.fopen(fetch_path, "w"): with salt.utils.files.fopen(fetch_path, "w"):