Skip to content

fix: defer fetch request when repo is not yet initialized during GitProvider init #70102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: defer fetch request when repo is not yet initialized during GitProvider init #70102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions salt/utils/gitfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,19 @@ def get_url(self):
def fetch_request_check(self):
fetch_request = salt.utils.path.join(self._salt_working_dir, "fetch_request")
if os.path.isfile(fetch_request):
if getattr(self, "repo", None) is None:
# The repo has not yet been initialized (e.g. we are being
# called from GitProvider.__init__ before the provider's
# init_remote() has run). Leave the fetch request in place
# so that a later call to this method (e.g. from checkout())
# can honor it once self.repo exists.
log.debug(
"Fetch request present for %s remote '%s', but repo is "
"not yet initialized; deferring",
self.role,
self.id,
)
return False
log.debug("Fetch request: %s", self._salt_working_dir)
try:
os.remove(fetch_request)
Expand Down