Skip to content

Commit bf40010

Browse files
committed
added access to finished flag within metadata
1 parent fc9b7c0 commit bf40010

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

splunklib/searchcommands/internals.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,9 @@ class ObjectView:
438438
def __init__(self, dictionary):
439439
self.__dict__ = dictionary
440440

441+
def update(self, obj):
442+
self.__dict__.update(obj.__dict__)
443+
441444
def __repr__(self):
442445
return repr(self.__dict__)
443446

splunklib/searchcommands/search_command.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,9 @@ def _execute_v2(self, ifile, process):
967967

968968
self._finished = getattr(metadata, 'finished', False)
969969
self._record_writer.is_flushed = False
970-
970+
# metadata.update(self._metadata)
971+
# self._metadata = metadata
972+
self._metadata.update(metadata)
971973
self._execute_chunk_v2(process, result)
972974

973975
self._record_writer.write_chunk(finished=self._finished)

tests/test_utils.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ def checkFilePermissions(dir_path):
8989
path = os.path.join(dir_path, file)
9090
if os.path.isfile(path):
9191
permission = oct(os.stat(path).st_mode)
92-
if sys.version_info >= (3, 0):
93-
self.assertEqual(permission, '0o100644')
94-
else :
95-
self.assertEqual(permission, '0100644')
92+
self.assertEqual(permission, '0o100644')
9693
else:
9794
checkFilePermissions(path)
9895

0 commit comments

Comments
 (0)