diff -Nru gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/bzr_panel/bzrpanel.py gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/bzr_panel/bzrpanel.py --- gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/bzr_panel/bzrpanel.py 2015-12-31 22:46:50.000000000 +0000 +++ gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/bzr_panel/bzrpanel.py 2016-01-03 11:46:35.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding:utf-8 -*- # A gedit plugin that provides a panel for Bazaar -# Copyright © 2010-2015 B. Clausius +# Copyright © 2010-2016 B. Clausius # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1027,7 +1027,8 @@ # destroy old comments if any return else: - assert False + error_dialog('Commit failed', str(result), window) + return if response != Gtk.ResponseType.YES: return diff -Nru gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/bzr_panel/worker/utils.py gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/bzr_panel/worker/utils.py --- gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/bzr_panel/worker/utils.py 2015-12-31 22:46:50.000000000 +0000 +++ gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/bzr_panel/worker/utils.py 2016-01-03 11:46:35.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# Copyright © 2013 B. Clausius +# Copyright © 2013, 2016 B. Clausius # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -116,6 +116,8 @@ specific_files=specific_files) except bzrlib.errors.PointlessCommit: return 'pointless' + except bzrlib.errors.BzrCommandError as e: + return str(e) return 'error' if rev_id is None else 'success' @_open_wt diff -Nru gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/debian/bzr-builder.manifest gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/debian/bzr-builder.manifest --- gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/debian/bzr-builder.manifest 2015-12-31 22:46:50.000000000 +0000 +++ gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/debian/bzr-builder.manifest 2016-01-03 11:46:36.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.2 deb-version {debupstream}~bzr665 -lp:gedit-bzr-panel revid:barcc@gmx.de-20151231223719-ndsqq8pjgyqsz9ou +# bzr-builder format 0.2 deb-version {debupstream}~bzr666 +lp:gedit-bzr-panel revid:barcc@gmx.de-20160103113059-o8ihel0xqnjk9ps3 diff -Nru gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/debian/changelog gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/debian/changelog --- gedit-bzr-panel-1.1~alpha1~bzr665~ubuntu14.04.1/debian/changelog 2015-12-31 22:46:50.000000000 +0000 +++ gedit-bzr-panel-1.1~alpha1~bzr666~ubuntu14.04.1/debian/changelog 2016-01-03 11:46:36.000000000 +0000 @@ -1,8 +1,8 @@ -gedit-bzr-panel (1.1~alpha1~bzr665~ubuntu14.04.1) trusty; urgency=low +gedit-bzr-panel (1.1~alpha1~bzr666~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Launchpad Package Builder Thu, 31 Dec 2015 22:46:50 +0000 + -- Launchpad Package Builder Sun, 03 Jan 2016 11:46:36 +0000 gedit-bzr-panel (1.1~alpha1-0~ppa1) UNRELEASED; urgency=low