mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Raise the correct exception when gitfs lockfile is empty
Catching the ValueError around line 416 means that when we re-raise the exception below, we raise the wrong exception. This commit explicitly raises the outer-scope exception that we caught above the block where we attempt to read from the lock file. Resolves #34114.
This commit is contained in:
parent
79a719b719
commit
86d1b8e864
1 changed files with 1 additions and 1 deletions
|
@ -442,7 +442,7 @@ class GitProvider(object):
|
|||
'by another master.')
|
||||
log.warning(msg)
|
||||
if failhard:
|
||||
raise
|
||||
raise exc
|
||||
return
|
||||
elif pid and pid_exists(pid):
|
||||
log.warning('Process %d has a %s %s lock (%s)',
|
||||
|
|
Loading…
Add table
Reference in a new issue