|
Jakub Filak |
0e0894e |
From 561ae94fe6e03e9af82f260dd438863037f61030 Mon Sep 17 00:00:00 2001
|
|
Jakub Filak |
0e0894e |
From: Dave Wysochanski <dwysocha@redhat.com>
|
|
Jakub Filak |
0e0894e |
Date: Tue, 6 Oct 2015 11:35:11 -0400
|
|
Jakub Filak |
0e0894e |
Subject: [PATCH] Set "crash" inside get_crash_cmd file if the file does not
|
|
Jakub Filak |
0e0894e |
exist, fix get_use_mock typeo.
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
This patch fixes a couple oversights in the previous patcheset to introduce crash_cmd and use_mock.
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
First, for older tasks which do not have a 'crash_cmd' file, we need to create one by
|
|
Jakub Filak |
0e0894e |
default. Otherwise, any retrace-server-worker or retrace-server-interact command may
|
|
Jakub Filak |
0e0894e |
fail as follows:
|
|
Jakub Filak |
0e0894e |
Traceback (most recent call last):
|
|
Jakub Filak |
0e0894e |
File "/usr/bin/retrace-server-interact", line 117, in <module>
|
|
Jakub Filak |
0e0894e |
crash_cmd = task.get_crash_cmd().split()
|
|
Jakub Filak |
0e0894e |
AttributeError: 'NoneType' object has no attribute 'split'
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
Second, retrace-server-interact contained a 'get_use_mock' function rather than 'use_mock'
|
|
Jakub Filak |
0e0894e |
This caused the following:
|
|
Jakub Filak |
0e0894e |
$ retrace-server-interact 757071668 shell
|
|
Jakub Filak |
0e0894e |
Traceback (most recent call last):
|
|
Jakub Filak |
0e0894e |
File "/usr/bin/retrace-server-interact", line 138, in <module>
|
|
Jakub Filak |
0e0894e |
if task.get_use_mock(kernelver):
|
|
Jakub Filak |
0e0894e |
AttributeError: RetraceTask instance has no attribute 'get_use_mock'
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
|
|
Jakub Filak |
0e0894e |
---
|
|
Jakub Filak |
0e0894e |
src/lib/retrace.py | 6 +++++-
|
|
Jakub Filak |
0e0894e |
src/retrace-server-interact | 2 +-
|
|
Jakub Filak |
0e0894e |
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
diff --git a/src/lib/retrace.py b/src/lib/retrace.py
|
|
Jakub Filak |
0e0894e |
index 9074786..8664788 100644
|
|
Jakub Filak |
0e0894e |
--- a/src/lib/retrace.py
|
|
Jakub Filak |
0e0894e |
+++ b/src/lib/retrace.py
|
|
Jakub Filak |
0e0894e |
@@ -2160,7 +2160,11 @@ class RetraceTask:
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
def get_crash_cmd(self):
|
|
Jakub Filak |
0e0894e |
"""Gets the contents of CRASH_CMD_FILE"""
|
|
Jakub Filak |
0e0894e |
- return self.get(RetraceTask.CRASH_CMD_FILE, maxlen=1 << 22)
|
|
Jakub Filak |
0e0894e |
+ result = self.get(RetraceTask.CRASH_CMD_FILE, maxlen=1 << 22)
|
|
Jakub Filak |
0e0894e |
+ if result is None:
|
|
Jakub Filak |
0e0894e |
+ self.set_crash_cmd("crash")
|
|
Jakub Filak |
0e0894e |
+ return "crash"
|
|
Jakub Filak |
0e0894e |
+ return result
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
def set_crash_cmd(self, data):
|
|
Jakub Filak |
0e0894e |
"""Writes data to CRASH_CMD_FILE"""
|
|
Jakub Filak |
0e0894e |
diff --git a/src/retrace-server-interact b/src/retrace-server-interact
|
|
Jakub Filak |
0e0894e |
index 5b26c8a..e518531 100755
|
|
Jakub Filak |
0e0894e |
--- a/src/retrace-server-interact
|
|
Jakub Filak |
0e0894e |
+++ b/src/retrace-server-interact
|
|
Jakub Filak |
0e0894e |
@@ -135,7 +135,7 @@ if __name__ == "__main__":
|
|
Jakub Filak |
0e0894e |
os.execvp(cmdline[0], cmdline)
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
if args.action == "shell":
|
|
Jakub Filak |
0e0894e |
- if task.get_use_mock(kernelver):
|
|
Jakub Filak |
0e0894e |
+ if task.use_mock(kernelver):
|
|
Jakub Filak |
0e0894e |
cmdline = ["/usr/bin/mock", "--configdir",
|
|
Jakub Filak |
0e0894e |
os.path.join(CONFIG["SaveDir"], "%d-kernel" % task.get_taskid()), "shell"]
|
|
Jakub Filak |
0e0894e |
|
|
Jakub Filak |
0e0894e |
--
|
|
Jakub Filak |
0e0894e |
2.7.0
|
|
Jakub Filak |
0e0894e |
|