Don't fetch owner info from job_info when --owner given

Commit 293c2bd49c0d ("Be more informative if owner info is missing")
introduced --owner but it is still pulled from job_info no matter what.
Fix it.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>

diff --git a/teuthology/kill.py b/teuthology/kill.py
index e422f86a60491d6a61b7ce364dc85d1d54fe80a6..0a8f7e2a29e9b239e02ec51b9dfd8cd9c375cf3d 100755 (executable)
--- a/teuthology/kill.py
+++ b/teuthology/kill.py
@@ -65,11 +65,12 @@ def kill_job(run_name, job_id, archive_base=None, owner=None,
              machine_type=None):
     serializer = report.ResultsSerializer(archive_base)
     job_info = serializer.job_info(run_name, job_id)
-    if not owner and 'owner' not in job_info:
-        raise RuntimeError(
-            "I could not figure out the owner of the requested job. "
-            "Please pass --owner <owner>.")
-    owner = job_info['owner']
+    if not owner:
+        if 'owner' not in job_info:
+            raise RuntimeError(
+                "I could not figure out the owner of the requested job. "
+                "Please pass --owner <owner>.")
+        owner = job_info['owner']
     kill_processes(run_name, [job_info.get('pid')])
     targets = dict(targets=job_info.get('targets', {}))
     nuke_targets(targets, owner)