check for missing entity before other checks
This commit is contained in:
parent
58a8ddcc8b
commit
e7ee7a3369
2 changed files with 5 additions and 4 deletions
|
@ -249,15 +249,15 @@ class Heartbeat(object):
|
||||||
if self.type != 'file':
|
if self.type != 'file':
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if not self.entity:
|
||||||
|
return
|
||||||
|
|
||||||
if not is_win:
|
if not is_win:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self._file_exists():
|
if self._file_exists():
|
||||||
return
|
return
|
||||||
|
|
||||||
if not self.entity:
|
|
||||||
return
|
|
||||||
|
|
||||||
self.args.local_file = self._to_unc_path(self.entity)
|
self.args.local_file = self._to_unc_path(self.entity)
|
||||||
|
|
||||||
def _to_unc_path(self, filepath):
|
def _to_unc_path(self, filepath):
|
||||||
|
|
|
@ -81,7 +81,8 @@ def format_file_path(filepath):
|
||||||
is_windows_network_mount = WINDOWS_NETWORK_MOUNT_PATTERN.match(filepath)
|
is_windows_network_mount = WINDOWS_NETWORK_MOUNT_PATTERN.match(filepath)
|
||||||
filepath = os.path.realpath(os.path.abspath(filepath))
|
filepath = os.path.realpath(os.path.abspath(filepath))
|
||||||
filepath = re.sub(BACKSLASH_REPLACE_PATTERN, '/', filepath)
|
filepath = re.sub(BACKSLASH_REPLACE_PATTERN, '/', filepath)
|
||||||
if WINDOWS_DRIVE_PATTERN.match(filepath):
|
is_windows_drive = WINDOWS_DRIVE_PATTERN.match(filepath)
|
||||||
|
if is_windows_drive:
|
||||||
filepath = filepath.capitalize()
|
filepath = filepath.capitalize()
|
||||||
if is_windows_network_mount:
|
if is_windows_network_mount:
|
||||||
# Add back a / to the front, since the previous modifications
|
# Add back a / to the front, since the previous modifications
|
||||||
|
|
Loading…
Reference in a new issue