Merge lp:~laney/gdebi/vte2.91 into lp:gdebi

Proposed by Iain Lane
Status: Merged
Merged at revision: 486
Proposed branch: lp:~laney/gdebi/vte2.91
Merge into: lp:gdebi
Diff against target: 94 lines (+14/-8)
3 files modified
GDebi/GDebiGtk.py (+6/-6)
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~laney/gdebi/vte2.91
Reviewer Review Type Date Requested Status
Michael Vogt Pending
gdebi-developers Pending
Review via email: mp+242059@code.launchpad.net

Description of the change

Port to vte 2.91

This isn't urgent because of the gi.require_version, but I'd still like to get everything off the 2.90 gir if possible.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GDebi/GDebiGtk.py'
2--- GDebi/GDebiGtk.py 2014-04-22 12:48:15 +0000
3+++ GDebi/GDebiGtk.py 2014-11-18 11:46:15 +0000
4@@ -40,7 +40,7 @@
5
6 import gi
7 gi.require_version("Gtk", "3.0")
8-gi.require_version("Vte", "2.90")
9+gi.require_version("Vte", "2.91")
10 from gi.repository import Gtk
11 from gi.repository import GObject
12 from gi.repository import GLib
13@@ -866,9 +866,8 @@
14 self.term_expander.set_expanded(False)
15 self.install = install
16 def commit(self):
17- def finish_dpkg(term, lock):
18+ def finish_dpkg(term, status, lock):
19 """ helper that is run when dpkg finishes """
20- status = term.get_child_exit_status()
21 self.exitstatus = posix.WEXITSTATUS(status)
22 #print "dpkg finished %s %s" % (pid,status)
23 #print "exit status: %s" % self.exitstatus
24@@ -922,7 +921,7 @@
25
26 # prepare for the fork
27 self.term.connect("child-exited", finish_dpkg, lock)
28- (res, pid) =self.term.fork_command_full(
29+ (res, pid) =self.term.spawn_sync(
30 Vte.PtyFlags.DEFAULT,
31 "/",
32 argv,
33@@ -931,6 +930,7 @@
34 # FIXME: add setup_func that closes all fds excpet for writefd
35 None, #setup_func
36 None, #setup_data
37+ None, #cancellable
38 )
39 #print "fork_command_full: ", res, pid
40
41@@ -1015,7 +1015,7 @@
42 # sleep just long enough to not create a busy loop
43 time.sleep(0.01)
44 def fork(self):
45- pty = Vte.Pty.new(Vte.PtyFlags.DEFAULT)
46+ pty = Vte.Pty.new_sync(Vte.PtyFlags.DEFAULT)
47 pid = os.fork()
48 if pid == 0:
49 # *grumpf* workaround bug in vte here (gnome bug #588871)
50@@ -1026,7 +1026,7 @@
51 pty.child_setup()
52 # FIXME: close all fds expect for self.writefd
53 else:
54- self.term.set_pty_object(pty)
55+ self.term.set_pty(pty)
56 self.term.watch_child(pid)
57 return pid
58 def wait_child(self):
59
60=== modified file 'debian/changelog'
61--- debian/changelog 2014-09-29 07:13:24 +0000
62+++ debian/changelog 2014-11-18 11:46:15 +0000
63@@ -1,3 +1,9 @@
64+gdebi (0.9.5.6) UNRELEASED; urgency=medium
65+
66+ * Use vte 2.91
67+
68+ -- Iain Lane <iain@orangesquash.org.uk> Tue, 18 Nov 2014 10:54:30 +0000
69+
70 gdebi (0.9.5.5) unstable; urgency=medium
71
72 * Team upload.
73
74=== modified file 'debian/control'
75--- debian/control 2014-09-29 07:07:27 +0000
76+++ debian/control 2014-11-18 11:46:15 +0000
77@@ -6,7 +6,7 @@
78 Build-Depends: debhelper (>= 9),
79 dh-python,
80 gir1.2-gtk-3.0,
81- gir1.2-vte-2.90,
82+ gir1.2-vte-2.91,
83 python3-all,
84 python3-apt,
85 python3-gi,
86@@ -44,7 +44,7 @@
87 ${misc:Depends},
88 gdebi-core (= ${source:Version}),
89 gir1.2-gtk-3.0,
90- gir1.2-vte-2.90,
91+ gir1.2-vte-2.91,
92 python3-gi,
93 gksu,
94 gnome-icon-theme

Subscribers

People subscribed via source and target branches

to status/vote changes: