Ubuntu
ubuntuone-installer package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174 into lp:ubuntu/oneiric/ubuntuone-installer

  1. Oneiric (11.10)
  2. release-174
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 6
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174
Merge into: lp:ubuntu/oneiric/ubuntuone-installer
Diff against target: 188 lines (+35/-14)
6 files modified
PKG-INFO (+1/-1)
bin/ubuntuone-installer (+6/-2)
debian/changelog (+9/-0)
po/POTFILES.in (+1/-0)
setup.py (+1/-1)
ubuntuone/installer/gui.py (+17/-10)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Review via email: mp+75437@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Looks good. Bug-fix only. Cause it is a new source I need the full source package before uploading (see #ubuntu-devel for discussion).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'PKG-INFO'
2--- PKG-INFO 2011-08-24 20:30:01 +0000
3+++ PKG-INFO 2011-09-14 21:54:36 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntuone-installer
7-Version: 1.7.3
8+Version: 1.7.4
9 Summary: Ubuntu One Installer
10 Home-page: https://launchpad.net/ubuntuone-installer
11 Author: Ubuntu One Hackers
12
13=== modified file 'bin/ubuntuone-installer'
14--- bin/ubuntuone-installer 2011-08-17 12:00:40 +0000
15+++ bin/ubuntuone-installer 2011-09-14 21:54:36 +0000
16@@ -17,14 +17,18 @@
17 """The main script for the Ubuntu One Installer."""
18
19 import apt
20+import os
21
22 from gi.repository import Gtk, GLib
23
24
25 def is_installed(package):
26 """Check if things are installed already."""
27- cache = apt.Cache()
28- return package in cache and cache[package].is_installed
29+ try:
30+ cache = apt.Cache()
31+ return package in cache and cache[package].is_installed
32+ except SystemError:
33+ return os.path.exists('/usr/bin/ubuntuone-control-panel-gtk')
34
35
36 if __name__ == "__main__":
37
38=== modified file 'debian/changelog'
39--- debian/changelog 2011-08-24 20:34:34 +0000
40+++ debian/changelog 2011-09-14 21:54:36 +0000
41@@ -1,3 +1,12 @@
42+ubuntuone-installer (1.7.4-0ubuntu1) oneiric; urgency=low
43+
44+ * New upstream release.
45+ - Work around apt.Cache crash with unreadable sources (LP: #843002)
46+ - Mark strings for translation in the UI (LP: #849408)
47+ - Install more of the Ubuntu One packages (LP: #840072)
48+
49+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Wed, 14 Sep 2011 17:32:14 -0400
50+
51 ubuntuone-installer (1.7.3-0ubuntu1) oneiric; urgency=low
52
53 * New upstream release.
54
55=== modified file 'po/POTFILES.in'
56--- po/POTFILES.in 2011-08-17 12:00:40 +0000
57+++ po/POTFILES.in 2011-09-14 21:54:36 +0000
58@@ -1,2 +1,3 @@
59 ubuntuone-installer.desktop.in
60+ubuntuone/installer/gui.py
61
62
63=== modified file 'setup.py'
64--- setup.py 2011-08-24 20:30:01 +0000
65+++ setup.py 2011-09-14 21:54:36 +0000
66@@ -52,7 +52,7 @@
67
68 DistUtilsExtra.auto.setup(
69 name='ubuntuone-installer',
70- version='1.7.3',
71+ version='1.7.4',
72 license='GPL v3',
73 author='Ubuntu One Hackers',
74 author_email='ubuntuone-users@lists.launchpad.net',
75
76=== modified file 'ubuntuone/installer/gui.py'
77--- ubuntuone/installer/gui.py 2011-08-24 20:30:01 +0000
78+++ ubuntuone/installer/gui.py 2011-09-14 21:54:36 +0000
79@@ -17,6 +17,7 @@
80
81 import aptdaemon.gtk3widgets as aptgtk
82 import aptdaemon.client as aptclient
83+import gettext
84 import os
85
86 from gi.repository import Gtk, GObject, GLib, Gdk, Pango
87@@ -31,6 +32,9 @@
88 if inline_callbacks is None:
89 inline_callbacks = old_callbacks
90
91+gettext.textdomain('ubuntuone-installer')
92+_ = gettext.gettext
93+
94
95 class UnsupportedDistribution(BaseException):
96 """Exception for when on an unsupported distribution."""
97@@ -91,14 +95,14 @@
98 self.__hlabelbox.show()
99
100 self.__hlabel = Gtk.Label((u'<span size="xx-large">{}</span>').format(
101- u'Install Ubuntu One'))
102+ _(u'Install Ubuntu One')))
103 self.__hlabel.set_use_markup(True)
104 self.__hlabel.set_alignment(0.0, 0.0)
105 self.__hlabelbox.pack_start(self.__hlabel, False, False, 0)
106 self.__hlabel.show()
107
108 self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format(
109- u'Discover the freedom of your personal cloud'))
110+ _(u'Discover the freedom of your personal cloud')))
111 self.__hlabel2.set_use_markup(True)
112 self.__hlabel2.set_alignment(0.0, 0.0)
113 self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0)
114@@ -217,7 +221,7 @@
115 page.pack_start(table, True, True, 24)
116 table.show()
117
118- label = Gtk.Label(u'<big>{}</big>'.format(u'Sync'))
119+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Sync')))
120 label.set_use_markup(True)
121 table.attach_defaults(label, 0, 1, 0, 1)
122 label.show()
123@@ -233,7 +237,7 @@
124 width_chars = (image.get_pixbuf().get_width() / width) * 2.5
125
126 label = Gtk.Label(u'<small>{}</small>'.format(
127- (u'Sync files across your devices.')))
128+ _(u'Sync files across your devices.')))
129 label.set_max_width_chars(width_chars)
130 label.set_width_chars(width_chars)
131 label.set_use_markup(True)
132@@ -247,7 +251,7 @@
133 table.attach_defaults(separator, 1, 2, 0, 3)
134 separator.show()
135
136- label = Gtk.Label(u'<big>{}</big>'.format(u'Stream'))
137+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Stream')))
138 label.set_use_markup(True)
139 table.attach_defaults(label, 2, 3, 0, 1)
140 label.show()
141@@ -260,7 +264,7 @@
142 image.set_from_file(path)
143
144 label = Gtk.Label(u'<small>{}</small>'.format(
145- (u'Stream your music on the move and offline.')))
146+ _(u'Stream your music on the move and offline.')))
147 label.set_max_width_chars(width_chars)
148 label.set_width_chars(width_chars)
149 label.set_use_markup(True)
150@@ -274,7 +278,7 @@
151 table.attach_defaults(separator, 3, 4, 0, 3)
152 separator.show()
153
154- label = Gtk.Label(u'<big>{}</big>'.format(u'Share'))
155+ label = Gtk.Label(u'<big>{}</big>'.format(_(u'Share')))
156 label.set_use_markup(True)
157 table.attach_defaults(label, 4, 5, 0, 1)
158 label.show()
159@@ -287,7 +291,7 @@
160 image.set_from_file(path)
161
162 label = Gtk.Label(u'<small>{}</small>'.format(
163- (u'Share with colleagues, friends, and family.')))
164+ _(u'Share with colleagues, friends, and family.')))
165 label.set_max_width_chars(width_chars)
166 label.set_width_chars(width_chars)
167 label.set_use_markup(True)
168@@ -306,7 +310,7 @@
169 page.set_spacing(6)
170 page.show()
171
172- label = Gtk.Label(u'Ubuntu One is installing…')
173+ label = Gtk.Label(_(u'Ubuntu One is installing…'))
174 label.set_alignment(0.0, 0.0)
175 page.pack_start(label, False, True, 0)
176 label.show()
177@@ -354,7 +358,10 @@
178 Gtk.main_quit()
179
180 transaction = yield self.client.install_packages(
181- package_names=['ubuntuone-control-panel-gtk',
182+ package_names=['banshee-extension-ubuntuonemusicstore',
183+ 'ubuntuone-client-gnome',
184+ 'ubuntuone-control-panel-gtk',
185+ 'ubuntuone-couch',
186 ])
187 transaction.connect('finished', finished)
188 self.__apt_progress.set_transaction(transaction)

Subscribers

People subscribed via source and target branches

to all changes: