sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

collector/dmesg: Fix dmesg_out property

Browse Source 
When no entry has been recorded by the collector, return an empty string
rather than returning the full dmesg log.

Also fix get_data() that would fail try to add None + '\n' if dmesg_out
property returns None.
This commit is contained in:
Douglas Raillard 2022-05-18 14:46:41 +01:00 committed by Marc Bonnici
parent cd8720b901
commit a9fcc75f60
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devlib/collector/dmesg.py
View File

@ -202,10 +202,10 @@ class DmesgCollector(CollectorBase):
try: try:
entry = self.entries[0] entry = self.entries[0]
except IndexError: except IndexError:
i = 0 return ''
else: else:
i = entry.line_nr i = entry.line_nr
return '\n'.join(out.splitlines()[i:]) return '\n'.join(out.splitlines()[i:])
@property @property
def entries(self): def entries(self):
@ -278,5 +278,5 @@ class DmesgCollector(CollectorBase):
if self.output_path is None: if self.output_path is None:
raise RuntimeError("Output path was not set.") raise RuntimeError("Output path was not set.")
with open(self.output_path, 'wt') as f: with open(self.output_path, 'wt') as f:
f.write(self.dmesg_out + '\n') f.write((self.dmesg_out or '') + '\n')
return CollectorOutput([CollectorOutputEntry(self.output_path, 'file')]) return CollectorOutput([CollectorOutputEntry(self.output_path, 'file')])