Skip to content

Commit 80d3e45

Browse files
committed
remote: fix undefined variable when "git push" fails
Signed-off-by: David Aguilar <davvid@gmail.com>
1 parent e59331b commit 80d3e45

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

cola/widgets/remote.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,12 +520,16 @@ def action_completed(self, task, status, out, err):
520520
command = 'git %s' % self.action.lower()
521521
message = (N_('"%(command)s" returned exit status %(status)d') %
522522
dict(command=command, status=status))
523+
details = ''
523524
if out:
524-
message += '\n\n' + out
525+
details = out
525526
if err:
526-
message += '\n\n' + err
527+
details += '\n\n' + err
527528

528-
Interaction.log(message)
529+
log_message = message
530+
if details:
531+
log_message += '\n\n' + details
532+
Interaction.log(log_message)
529533

530534
if status == 0:
531535
self.accept()
@@ -536,7 +540,7 @@ def action_completed(self, task, status, out, err):
536540
message += N_('Have you rebased/pulled lately?')
537541

538542
Interaction.critical(self.windowTitle(),
539-
message=message, details=output)
543+
message=message, details=details)
540544

541545

542546
# Use distinct classes so that each saves its own set of preferences

0 commit comments

Comments
 (0)