Skip to content

Commit cda355c

Browse files
authored
Merge pull request #45 from radomirbosak/fix-no-jobs
Fix AttributeErrors for `stop` and `info` commands
2 parents 7966629 + da363fb commit cda355c

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

jenkins_cli/cli.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ def info(self, args):
175175
job_info = self.jenkins.get_job_info(job_name, 1)
176176
if not job_info:
177177
job_info = {}
178-
last_build = job_info.get('lastBuild', {})
179-
last_success_build = job_info.get('lastSuccessfulBuild', {})
178+
last_build = job_info.get('lastBuild') or {}
179+
last_success_build = job_info.get('lastSuccessfulBuild') or {}
180180
xml = self.jenkins.get_job_config(job_name)
181181
root = ElementTree.fromstring(xml.encode('utf-8'))
182182
scm_name, branch_node = self._get_scm_name_and_node(root)
@@ -247,8 +247,9 @@ def builds(self, args):
247247
def stop(self, args):
248248
job_name = self._check_job(args.job_name)
249249
info = self.jenkins.get_job_info(job_name, 1)
250-
build_number = info['lastBuild'].get('number')
251-
if build_number and info['lastBuild'].get('building'):
250+
last_build = info.get('lastBuild') or {}
251+
build_number = last_build.get('number')
252+
if build_number and last_build.get('building'):
252253
stop_status = self.jenkins.stop_build(job_name, build_number)
253254
print("%s: %s" % (job_name, 'stopped' if not stop_status else stop_status))
254255
else:

0 commit comments

Comments
 (0)