--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gdebi
This upload fixes RC bug #691998, plus some crashes bugs reported in Launchpad:
* Do not set a busy cursor if there is no X11 window
https://launchpad.net/bugs/1055181
* Define apt.Cache in class initialization
https://launchpad.net/bugs/1072799
* Add file to gdebi-core dependencies
https://launchpad.net/bugs/1067306
I'm attaching a debdiff of the changes introduced.
unblock gdebi/0.8.7
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
=== modified file 'GDebi/GDebi.py'
--- GDebi/GDebi.py 2012-10-11 19:21:07 +0000
+++ GDebi/GDebi.py 2012-10-11 20:09:07 +0000
@@ -145,13 +145,19 @@
self.synaptic_config = apt_pkg.Configuration()
if file != "" and os.path.exists(file):
- self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
+ self.open(file)
+ self.window_main.set_sensitive(True)
+
+ def _show_busy_cursor(self, show_busy_cursor):
+ win = self.window_main.get_window()
+ if not win:
+ return
+ if show_busy_cursor:
+ win.set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
while Gtk.events_pending():
Gtk.main_iteration()
- self.open(file)
- self.window_main.get_window().set_cursor(None)
-
- self.window_main.set_sensitive(True)
+ else:
+ win.set_cursor(None)
def gio_progress_callback(self, bytes_read, bytes_total, data):
self.progressbar_download.set_fraction(bytes_read/float(bytes_total))
@@ -224,14 +230,12 @@
path = self._get_file_path_from_dnd_dropped_uri(uri)
#print 'path to open', path
if path.endswith(".deb"):
- self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
- while Gtk.events_pending():
- Gtk.main_iteration()
self.open(path)
- self.window_main.get_window().set_cursor(None)
def open(self, file, downloaded=False):
+ self._show_busy_cursor(True)
res = GDebiCommon.open(self, file, downloaded)
+ self._show_busy_cursor(False)
if res == False:
self.show_alert(Gtk.MessageType.ERROR, self.error_header, self.error_body)
return False
=== modified file 'GDebi/GDebiCli.py'
--- GDebi/GDebiCli.py 2012-10-11 19:23:54 +0000
+++ GDebi/GDebiCli.py 2012-11-02 13:29:24 +0000
@@ -122,10 +122,7 @@
iprogress = apt.progress.base.InstallProgress()
try:
res = self._cache.commit(fprogress,iprogress)
- except apt.cache.FetchFailedException, e:
- sys.stderr.write(_("Error during install: '%s'") % e)
- return 1
- except SystemError, e:
+ except (apt.cache.FetchFailedException, SystemError), e:
sys.stderr.write(_("Error during install: '%s'") % e)
return 1
=== modified file 'GDebi/GDebiCommon.py'
--- GDebi/GDebiCommon.py 2012-09-12 21:28:17 +0000
+++ GDebi/GDebiCommon.py 2012-11-02 13:29:24 +0000
@@ -52,6 +52,7 @@
# cprogress may be different in child classes
def __init__(self, datadir, options, file=""):
self.cprogress = None
+ self._cache = None
self.deps = ""
self.version_info_title = ""
self.version_info_msg = ""
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-11 20:07:12 +0000
+++ debian/changelog 2012-11-02 16:36:21 +0000
@@ -1,3 +1,23 @@
+gdebi (0.8.7) unstable; urgency=low
+
+ [ Michael Vogt ]
+ * GDebi/GDebi.py:
+ - do not set a busy cursor if there is no X11 window (LP: #1055181).
+
+ [ Jason Conti ]
+ * GDebi/GDebiCommon.py:
+ - Define apt.Cache in class initialization (LP: #1072799).
+
+ [ Luca Falavigna ]
+ * gdebi-kde:
+ - Do not use unicode in help options (Closes: #691998, LP: #1063114).
+ * GDebi/GDebiCli.py:
+ - Improve exception handling.
+ * debian/control:
+ - Add file to gdebi-core dependencies (LP: #1067306).
+
+ -- Luca Falavigna <dktrkranz@debian.org> Fri, 02 Nov 2012 17:36:06 +0100
+
gdebi (0.8.6) unstable; urgency=low
* gdebi, GDebi/GDebiCli.py:
=== modified file 'debian/control'
--- debian/control 2012-09-12 21:17:04 +0000
+++ debian/control 2012-11-02 12:30:07 +0000
@@ -16,7 +16,8 @@
Depends: ${python:Depends},
${misc:Depends},
python-apt (>= 0.7.97),
- python-debian (>= 0.1.15)
+ python-debian (>= 0.1.15),
+ file
Suggests: xz-utils | xz-lzma
Description: simple tool to install deb files
gdebi lets you install local deb packages resolving and installing
=== modified file 'gdebi-kde'
--- gdebi-kde 2012-09-12 22:03:35 +0000
+++ gdebi-kde 2012-11-02 13:10:33 +0000
@@ -64,7 +64,7 @@
parser.add_option("-n", "--non-interactive",
action="store_true", dest="non_interactive",
default=False,
- help=unicode(_("Run non-interactive (dangerous!)"),"UTF-8"))
+ help=_("Run non-interactive (dangerous!)"))
(options, args) = parser.parse_args()
try:
--- End Message ---