Merge pull request #45 from radomirbosak/fix-no-jobs

Fix AttributeErrors for `stop` and `info` commands
LD250 · Jun 3, 2017 · cda355c · cda355c
2 parents 7966629 + da363fb
commit cda355c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/jenkins_cli/cli.py b/jenkins_cli/cli.py
@@ -175,8 +175,8 @@ def info(self, args):
         job_info = self.jenkins.get_job_info(job_name, 1)
         if not job_info:
             job_info = {}
-        last_build = job_info.get('lastBuild', {})
-        last_success_build = job_info.get('lastSuccessfulBuild', {})
+        last_build = job_info.get('lastBuild') or {}
+        last_success_build = job_info.get('lastSuccessfulBuild') or {}
         xml = self.jenkins.get_job_config(job_name)
         root = ElementTree.fromstring(xml.encode('utf-8'))
         scm_name, branch_node = self._get_scm_name_and_node(root)
@@ -247,8 +247,9 @@ def builds(self, args):
     def stop(self, args):
         job_name = self._check_job(args.job_name)
         info = self.jenkins.get_job_info(job_name, 1)
-        build_number = info['lastBuild'].get('number')
-        if build_number and info['lastBuild'].get('building'):
+        last_build = info.get('lastBuild') or {}
+        build_number = last_build.get('number')
+        if build_number and last_build.get('building'):
             stop_status = self.jenkins.stop_build(job_name, build_number)
             print("%s: %s" % (job_name, 'stopped' if not stop_status else stop_status))
         else: