Libertine

Merge lp:~larryprice/libertine/fix-infinite-app-removal into lp:libertine

  1. fix-infinite-app-removal
  2. Merge into devel
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 213
Merged at revision: 209
Proposed branch: lp:~larryprice/libertine/fix-infinite-app-removal
Merge into: lp:libertine
Diff against target: 888 lines (+295/-232)
4 files modified
po/en_US.po (+89/-53)
po/libertine.pot (+200/-175)
python/libertine/Libertine.py (+5/-3)
tools/libertine-container-manager (+1/-1)
To merge this branch: bzr merge lp:~larryprice/libertine/fix-infinite-app-removal
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+292581@code.launchpad.net

Commit message

Fixing infinite package removal on error caused by bad apt command and variable access.

Description of the change

It appears that `apt` does not have an `autoremove` command, so updating `remove_package` to use `apt-get` instead (which is how it used to work). Also fixing syntax error when accessing package name on package removal error.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:210
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/189/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/192
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/151
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/151
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/151
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/151
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1087/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/189/rebuild

review: Approve (continuous-integration)
lp:~larryprice/libertine/fix-infinite-app-removal updated
211. By Larry Price

remove unnecessary import

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:211
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/190/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/193
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/152
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/152
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/152
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/152
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1088/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/190/rebuild

review: Approve (continuous-integration)
lp:~larryprice/libertine/fix-infinite-app-removal updated
212. By Larry Price

Use apt-get for every package request

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:212
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/191/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/194
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/153
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/153
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/153
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/153
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1089/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/191/rebuild

review: Approve (continuous-integration)
lp:~larryprice/libertine/fix-infinite-app-removal updated
213. By Larry Price

Adding progress bar apt-get options.

Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :

PASSED: Continuous integration, rev:213
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/193/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/196
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/155
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/155
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/155
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/155
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1091/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/193/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Great, looks good to me. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/en_US.po'
2--- po/en_US.po 2016-04-08 20:16:41 +0000
3+++ po/en_US.po 2016-04-22 16:16:24 +0000
4@@ -7,7 +7,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2016-04-08 16:01-0400\n"
9+"POT-Creation-Date: 2016-04-22 09:44-0400\n"
10 "PO-Revision-Date: 2016-03-21 10:21-0400\n"
11 "Last-Translator: Chris Townsend <christopher.townsend@canonical.com>\n"
12 "Language-Team: English\n"
13@@ -25,7 +25,7 @@
14 msgid "Add additional PPA"
15 msgstr ""
16
17-#: ../libertine/qml/ExtraArchivesView.qml:133
18+#: ../libertine/qml/ExtraArchivesView.qml:148
19 msgid "Adding archive failed"
20 msgstr ""
21
22@@ -33,7 +33,7 @@
23 msgid "Additional Archives and PPAs"
24 msgstr ""
25
26-#: ../libertine/qml/ConfigureContainer.qml:59
27+#: ../libertine/qml/ManageContainer.qml:59
28 msgid "Additional archives and PPAs"
29 msgstr ""
30
31@@ -41,14 +41,14 @@
32 msgid "Authentication required"
33 msgstr ""
34
35-#: ../libertine/qml/DebianPackagePicker.qml:7
36+#: ../libertine/qml/DebianPackagePicker.qml:26
37 msgid "Available Debian Packages to Install"
38 msgstr ""
39
40+#: ../libertine/qml/ContainerOptionsDialog.qml:75
41+#: ../libertine/qml/ContainerPasswordDialog.qml:70
42 #: ../libertine/qml/SearchPackagesDialog.qml:57
43-#: ../libertine/qml/ContainerPasswordDialog.qml:70
44 #: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
45-#: ../libertine/qml/ContainerOptionsDialog.qml:75
46 msgid "Cancel"
47 msgstr ""
48
49@@ -60,27 +60,24 @@
50 msgid "Classic Apps - %1"
51 msgstr "Classic Apps - %1"
52
53-#: ../libertine/qml/ConfigureContainer.qml:27
54-msgid "Configure %1"
55-msgstr "Configure %1"
56-
57-#: ../libertine/qml/HomeView.qml:102
58-msgid "Configure Container"
59-msgstr "Configure Container"
60-
61 #: ../libertine/qml/ContainerOptionsDialog.qml:28
62 #, fuzzy
63 msgid "Configure options for container creation."
64 msgstr "Configure Container"
65
66-#: ../libertine/qml/ContainersView.qml:96
67+#: ../libertine/qml/ContainersView.qml:100
68 msgid "Container Apps"
69 msgstr "Container Apps"
70
71-#: ../libertine/qml/ContainersView.qml:87
72+#: ../libertine/qml/ContainersView.qml:91
73 msgid "Container Info"
74 msgstr "Container Info"
75
76+#: ../libertine/qml/HomeView.qml:108
77+#, fuzzy
78+msgid "Container Information"
79+msgstr "Container information for %1"
80+
81 #: ../libertine/qml/ContainerOptionsDialog.qml:27
82 #, fuzzy
83 msgid "Container Options"
84@@ -90,11 +87,12 @@
85 msgid "Container information for %1"
86 msgstr "Container information for %1"
87
88-#: ../libertine/qml/ContainersView.qml:69
89+#: ../libertine/qml/ContainersView.qml:73
90 msgid "Delete Container"
91 msgstr "Delete Container"
92
93-#: ../libertine/qml/ExtraArchivesView.qml:137
94+#: ../libertine/qml/PackageOperationFailureDialog.qml:33
95+#: ../libertine/qml/ExtraArchivesView.qml:152
96 msgid "Dismiss"
97 msgstr ""
98
99@@ -121,9 +119,11 @@
100 msgid "Enter package name or Debian file"
101 msgstr "Please enter the exact package name of the app to install:"
102
103-#: ../libertine/qml/PackageInfoView.qml:66
104-msgid "Failure reason"
105-msgstr ""
106+#. Either "installing" or "removing"
107+#: ../libertine/qml/PackageOperationFailureDialog.qml:29
108+#, fuzzy
109+msgid "Failure %1 the %2 package."
110+msgstr "Information for the %1 package"
111
112 #: ../libertine/qml/ContainerInfoView.qml:48
113 msgid "ID"
114@@ -137,8 +137,8 @@
115 msgid "Install"
116 msgstr "Install"
117
118+#: ../libertine/qml/DebianPackagePicker.qml:53
119 #: ../libertine/qml/SearchResults.qml:42
120-#: ../libertine/qml/DebianPackagePicker.qml:34
121 msgid "Install Package"
122 msgstr "Install Package"
123
124@@ -147,7 +147,7 @@
125 msgid "Install new package"
126 msgstr "Install Package"
127
128-#: ../libertine/qml/PackageInfoView.qml:58
129+#: ../libertine/qml/PackageInfoView.qml:56
130 #, fuzzy
131 msgid "Install status"
132 msgstr "Install status: %1"
133@@ -156,6 +156,15 @@
134 msgid "Invalid password entered"
135 msgstr ""
136
137+#: ../libertine/qml/ManageContainer.qml:27
138+msgid "Manage %1"
139+msgstr ""
140+
141+#: ../libertine/qml/HomeView.qml:102
142+#, fuzzy
143+msgid "Manage Container"
144+msgstr "My Containers"
145+
146 #: ../libertine/qml/ContainersView.qml:31
147 msgid "My Containers"
148 msgstr "My Containers"
149@@ -165,7 +174,7 @@
150 msgid "Name"
151 msgstr "Name: %1"
152
153-#: ../libertine/qml/DebianPackagePicker.qml:53
154+#: ../libertine/qml/DebianPackagePicker.qml:72
155 msgid "No Debian packages available"
156 msgstr ""
157
158@@ -174,18 +183,27 @@
159 msgid "No Search Results Found"
160 msgstr "No search results for %1."
161
162+#: ../libertine/qml/ExtraArchivesView.qml:119
163+msgid "No additional archives and PPA's have been added"
164+msgstr ""
165+
166+#: ../libertine/qml/HomeView.qml:227
167+#, fuzzy
168+msgid "No packages are installed"
169+msgstr "Please enter the exact package name of the app to install:"
170+
171+#: ../libertine/qml/ContainerOptionsDialog.qml:64
172+#: ../libertine/qml/ContainerPasswordDialog.qml:52
173 #: ../libertine/qml/SearchPackagesDialog.qml:39
174-#: ../libertine/qml/ContainerPasswordDialog.qml:52
175 #: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
176-#: ../libertine/qml/ContainerOptionsDialog.qml:64
177 msgid "OK"
178 msgstr ""
179
180-#: ../libertine/qml/PackageInfoView.qml:33
181+#: ../libertine/qml/PackageInfoView.qml:32
182 msgid "Obtaining package version…"
183 msgstr "Obtaining package version…"
184
185-#: ../libertine/qml/HomeView.qml:202
186+#: ../libertine/qml/HomeView.qml:209
187 msgid "Package Info"
188 msgstr "Package Info"
189
190@@ -197,7 +215,7 @@
191 msgid "Package name or Debian package path"
192 msgstr ""
193
194-#: ../libertine/qml/PackageInfoView.qml:51
195+#: ../libertine/qml/PackageInfoView.qml:49
196 #, fuzzy
197 msgid "Package version"
198 msgstr "Package version: %1"
199@@ -206,11 +224,11 @@
200 msgid "Password is required to create a Libertine container"
201 msgstr ""
202
203-#: ../libertine/qml/HomeView.qml:188
204+#: ../libertine/qml/HomeView.qml:196
205 msgid "Remove Package"
206 msgstr "Remove Package"
207
208-#: ../libertine/qml/ExtraArchivesView.qml:97
209+#: ../libertine/qml/ExtraArchivesView.qml:102
210 msgid "Remove extra archive"
211 msgstr ""
212
213@@ -247,12 +265,12 @@
214 msgid "Search archives for packages"
215 msgstr ""
216
217+#: ../libertine/qml/SearchResultsView.qml:39
218 #: ../libertine/qml/SearchPackagesDialog.qml:26
219-#: ../libertine/qml/SearchResultsView.qml:39
220 msgid "Search for packages"
221 msgstr ""
222
223-#: ../libertine/qml/SearchResultsView.qml:90
224+#: ../libertine/qml/SearchResultsView.qml:92
225 #, fuzzy
226 msgid "Searching for packages…"
227 msgstr "Obtaining package version…"
228@@ -277,10 +295,15 @@
229 "The %1 package is already installed. Please try a different package name."
230 msgstr "Package %1 already installed. Please try a different package name."
231
232-#: ../libertine/qml/HomeView.qml:108
233-msgid "Update Container"
234+#: ../libertine/qml/ManageContainer.qml:86
235+#, fuzzy
236+msgid "Update container"
237 msgstr "Update Container"
238
239+#: ../libertine/qml/ManageContainer.qml:70
240+msgid "Update…"
241+msgstr ""
242+
243 #: ../libertine/qml/WelcomeView.qml:27
244 msgid "Welcome"
245 msgstr "Welcome"
246@@ -308,39 +331,38 @@
247 msgid "container name"
248 msgstr "Container Info"
249
250-#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187
251+#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
252 msgid "delete"
253 msgstr "delete"
254
255-#: ../libertine/qml/ContainersView.qml:95
256+#: ../libertine/qml/ContainersView.qml:99
257 msgid "edit"
258 msgstr "edit"
259
260-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:186
261-#: ../libertine/qml/PackageInfoView.qml:120
262+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
263 msgid "failed"
264 msgstr "failed"
265
266-#: ../libertine/qml/ConfigureContainer.qml:55
267 #: ../libertine/qml/ContainerOptionsDialog.qml:40
268+#: ../libertine/qml/ManageContainer.qml:55
269 msgid "i386 multiarch support"
270 msgstr "i386 multiarch support"
271
272-#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201
273+#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
274 msgid "info"
275 msgstr "info"
276
277-#: ../libertine/ContainerConfig.cpp:185
278+#: ../libertine/ContainerConfig.cpp:186
279 msgid "installed"
280 msgstr "installed"
281
282-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:184
283-#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:171
284-#: ../libertine/qml/ExtraArchivesView.qml:80
285+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
286+#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
287+#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
288 msgid "installing"
289 msgstr "installing"
290
291-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:183
292+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
293 msgid "new"
294 msgstr "new"
295
296@@ -349,24 +371,26 @@
297 msgid "password"
298 msgstr "Password"
299
300-#: ../libertine/ContainerConfig.cpp:149
301+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
302+#: ../libertine/qml/ManageContainer.qml:71
303+#: ../libertine/qml/ManageContainer.qml:111
304 msgid "ready"
305 msgstr "ready"
306
307-#: ../libertine/qml/ExtraArchivesView.qml:96
308+#: ../libertine/qml/ExtraArchivesView.qml:101
309 #, fuzzy
310 msgid "remove"
311 msgstr "removed"
312
313-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
314-#: ../libertine/qml/PackageInfoView.qml:110
315+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
316 #: ../libertine/qml/ContainerInfoView.qml:88
317+#: ../libertine/qml/PackageInfoView.qml:85
318 msgid "removed"
319 msgstr "removed"
320
321-#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:187
322-#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:172
323-#: ../libertine/qml/ExtraArchivesView.qml:81
324+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
325+#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
326+#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
327 msgid "removing"
328 msgstr "removing"
329
330@@ -374,6 +398,18 @@
331 msgid "search"
332 msgstr ""
333
334+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
335+#: ../libertine/qml/ManageContainer.qml:83
336+#: ../libertine/qml/ManageContainer.qml:107
337+msgid "updating"
338+msgstr ""
339+
340+#~ msgid "Configure %1"
341+#~ msgstr "Configure %1"
342+
343+#~ msgid "Configure Container"
344+#~ msgstr "Configure Container"
345+
346 #~ msgid "ID: %1"
347 #~ msgstr "ID: %1"
348
349
350=== modified file 'po/libertine.pot'
351--- po/libertine.pot 2016-04-08 20:16:41 +0000
352+++ po/libertine.pot 2016-04-22 16:16:24 +0000
353@@ -8,7 +8,7 @@
354 msgstr ""
355 "Project-Id-Version: PACKAGE VERSION\n"
356 "Report-Msgid-Bugs-To: \n"
357-"POT-Creation-Date: 2016-04-08 16:01-0400\n"
358+"POT-Creation-Date: 2016-04-22 09:44-0400\n"
359 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
360 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
361 "Language-Team: LANGUAGE <LL@li.org>\n"
362@@ -17,145 +17,83 @@
363 "Content-Type: text/plain; charset=UTF-8\n"
364 "Content-Transfer-Encoding: 8bit\n"
365
366-#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:183
367+#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
368 msgid "new"
369 msgstr ""
370
371-#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:184
372-#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:171
373-#: ../libertine/qml/ExtraArchivesView.qml:80
374+#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
375+#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
376+#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
377 msgid "installing"
378 msgstr ""
379
380-#: ../libertine/ContainerConfig.cpp:149
381+#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
382+#: ../libertine/qml/ManageContainer.qml:71
383+#: ../libertine/qml/ManageContainer.qml:111
384 msgid "ready"
385 msgstr ""
386
387-#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:187
388-#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:172
389-#: ../libertine/qml/ExtraArchivesView.qml:81
390+#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
391+#: ../libertine/qml/ManageContainer.qml:83
392+#: ../libertine/qml/ManageContainer.qml:107
393+msgid "updating"
394+msgstr ""
395+
396+#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
397+#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
398+#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
399 msgid "removing"
400 msgstr ""
401
402-#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
403-#: ../libertine/qml/PackageInfoView.qml:110
404+#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
405 #: ../libertine/qml/ContainerInfoView.qml:88
406+#: ../libertine/qml/PackageInfoView.qml:85
407 msgid "removed"
408 msgstr ""
409
410-#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:186
411-#: ../libertine/qml/PackageInfoView.qml:120
412+#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
413 msgid "failed"
414 msgstr ""
415
416-#: ../libertine/ContainerConfig.cpp:185
417+#: ../libertine/ContainerConfig.cpp:186
418 msgid "installed"
419 msgstr ""
420
421-#: ../libertine/qml/PackageExistsDialog.qml:28
422-msgid "The %1 package is already installed."
423-msgstr ""
424-
425-#: ../libertine/qml/PackageExistsDialog.qml:29
426-msgid "Search again or return to search results."
427-msgstr ""
428-
429-#: ../libertine/qml/PackageExistsDialog.qml:33
430-msgid "Search again"
431-msgstr ""
432-
433-#: ../libertine/qml/PackageExistsDialog.qml:43
434-msgid "Return to search results"
435-msgstr ""
436-
437-#: ../libertine/qml/ContainersView.qml:31
438-msgid "My Containers"
439-msgstr ""
440-
441-#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187
442-msgid "delete"
443-msgstr ""
444-
445-#: ../libertine/qml/ContainersView.qml:69
446-msgid "Delete Container"
447-msgstr ""
448-
449-#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201
450-msgid "info"
451-msgstr ""
452-
453-#: ../libertine/qml/ContainersView.qml:87
454-msgid "Container Info"
455-msgstr ""
456-
457-#: ../libertine/qml/ContainersView.qml:95
458-msgid "edit"
459-msgstr ""
460-
461-#: ../libertine/qml/ContainersView.qml:96
462-msgid "Container Apps"
463-msgstr ""
464-
465-#: ../libertine/qml/ConfigureContainer.qml:27
466-msgid "Configure %1"
467-msgstr ""
468-
469-#: ../libertine/qml/ConfigureContainer.qml:55
470+#: ../libertine/qml/ContainerOptionsDialog.qml:27
471+msgid "Container Options"
472+msgstr ""
473+
474+#: ../libertine/qml/ContainerOptionsDialog.qml:28
475+msgid "Configure options for container creation."
476+msgstr ""
477+
478 #: ../libertine/qml/ContainerOptionsDialog.qml:40
479+#: ../libertine/qml/ManageContainer.qml:55
480 msgid "i386 multiarch support"
481 msgstr ""
482
483-#: ../libertine/qml/ConfigureContainer.qml:59
484-msgid "Additional archives and PPAs"
485-msgstr ""
486-
487-#: ../libertine/qml/SearchPackagesDialog.qml:26
488-#: ../libertine/qml/SearchResultsView.qml:39
489-msgid "Search for packages"
490-msgstr ""
491-
492-#: ../libertine/qml/SearchPackagesDialog.qml:27
493-msgid "Search archives for packages"
494-msgstr ""
495-
496-#: ../libertine/qml/SearchPackagesDialog.qml:31
497-msgid "search"
498-msgstr ""
499-
500+#: ../libertine/qml/ContainerOptionsDialog.qml:50
501+msgid "Enter or name for the container or leave blank for default name"
502+msgstr ""
503+
504+#: ../libertine/qml/ContainerOptionsDialog.qml:56
505+msgid "container name"
506+msgstr ""
507+
508+#: ../libertine/qml/ContainerOptionsDialog.qml:64
509+#: ../libertine/qml/ContainerPasswordDialog.qml:52
510 #: ../libertine/qml/SearchPackagesDialog.qml:39
511-#: ../libertine/qml/ContainerPasswordDialog.qml:52
512 #: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
513-#: ../libertine/qml/ContainerOptionsDialog.qml:64
514 msgid "OK"
515 msgstr ""
516
517+#: ../libertine/qml/ContainerOptionsDialog.qml:75
518+#: ../libertine/qml/ContainerPasswordDialog.qml:70
519 #: ../libertine/qml/SearchPackagesDialog.qml:57
520-#: ../libertine/qml/ContainerPasswordDialog.qml:70
521 #: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
522-#: ../libertine/qml/ContainerOptionsDialog.qml:75
523 msgid "Cancel"
524 msgstr ""
525
526-#: ../libertine/qml/PackageInfoView.qml:28
527-msgid "Information for the %1 package"
528-msgstr ""
529-
530-#: ../libertine/qml/PackageInfoView.qml:33
531-msgid "Obtaining package version…"
532-msgstr ""
533-
534-#: ../libertine/qml/PackageInfoView.qml:51
535-msgid "Package version"
536-msgstr ""
537-
538-#: ../libertine/qml/PackageInfoView.qml:58
539-msgid "Install status"
540-msgstr ""
541-
542-#: ../libertine/qml/PackageInfoView.qml:66
543-msgid "Failure reason"
544-msgstr ""
545-
546 #: ../libertine/qml/SearchResultsView.qml:28
547 msgid "Package Search Results"
548 msgstr ""
549@@ -164,6 +102,11 @@
550 msgid "Search"
551 msgstr ""
552
553+#: ../libertine/qml/SearchResultsView.qml:39
554+#: ../libertine/qml/SearchPackagesDialog.qml:26
555+msgid "Search for packages"
556+msgstr ""
557+
558 #: ../libertine/qml/SearchResultsView.qml:49
559 msgid "No Search Results Found"
560 msgstr ""
561@@ -176,20 +119,20 @@
562 msgid "Return to Apps Page"
563 msgstr ""
564
565-#: ../libertine/qml/SearchResultsView.qml:90
566+#: ../libertine/qml/SearchResultsView.qml:92
567 msgid "Searching for packages…"
568 msgstr ""
569
570+#: ../libertine/qml/DebianPackagePicker.qml:26
571+msgid "Available Debian Packages to Install"
572+msgstr ""
573+
574+#: ../libertine/qml/DebianPackagePicker.qml:53
575 #: ../libertine/qml/SearchResults.qml:42
576-#: ../libertine/qml/DebianPackagePicker.qml:34
577 msgid "Install Package"
578 msgstr ""
579
580-#: ../libertine/qml/DebianPackagePicker.qml:7
581-msgid "Available Debian Packages to Install"
582-msgstr ""
583-
584-#: ../libertine/qml/DebianPackagePicker.qml:53
585+#: ../libertine/qml/DebianPackagePicker.qml:72
586 msgid "No Debian packages available"
587 msgstr ""
588
589@@ -209,6 +152,88 @@
590 msgid "password"
591 msgstr ""
592
593+#: ../libertine/qml/ContainerInfoView.qml:28
594+msgid "Container information for %1"
595+msgstr ""
596+
597+#: ../libertine/qml/ContainerInfoView.qml:48
598+msgid "ID"
599+msgstr ""
600+
601+#: ../libertine/qml/ContainerInfoView.qml:55
602+msgid "Name"
603+msgstr ""
604+
605+#: ../libertine/qml/ContainerInfoView.qml:62
606+msgid "Distribution"
607+msgstr ""
608+
609+#: ../libertine/qml/ContainerInfoView.qml:69
610+msgid "Status"
611+msgstr ""
612+
613+#. Either "installing" or "removing"
614+#: ../libertine/qml/PackageOperationFailureDialog.qml:29
615+msgid "Failure %1 the %2 package."
616+msgstr ""
617+
618+#: ../libertine/qml/PackageOperationFailureDialog.qml:33
619+#: ../libertine/qml/ExtraArchivesView.qml:152
620+msgid "Dismiss"
621+msgstr ""
622+
623+#: ../libertine/qml/ContainersView.qml:31
624+msgid "My Containers"
625+msgstr ""
626+
627+#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
628+msgid "delete"
629+msgstr ""
630+
631+#: ../libertine/qml/ContainersView.qml:73
632+msgid "Delete Container"
633+msgstr ""
634+
635+#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
636+msgid "info"
637+msgstr ""
638+
639+#: ../libertine/qml/ContainersView.qml:91
640+msgid "Container Info"
641+msgstr ""
642+
643+#: ../libertine/qml/ContainersView.qml:99
644+msgid "edit"
645+msgstr ""
646+
647+#: ../libertine/qml/ContainersView.qml:100
648+msgid "Container Apps"
649+msgstr ""
650+
651+#: ../libertine/qml/SearchPackagesDialog.qml:27
652+msgid "Search archives for packages"
653+msgstr ""
654+
655+#: ../libertine/qml/SearchPackagesDialog.qml:31
656+msgid "search"
657+msgstr ""
658+
659+#: ../libertine/qml/ManageContainer.qml:27
660+msgid "Manage %1"
661+msgstr ""
662+
663+#: ../libertine/qml/ManageContainer.qml:59
664+msgid "Additional archives and PPAs"
665+msgstr ""
666+
667+#: ../libertine/qml/ManageContainer.qml:70
668+msgid "Update…"
669+msgstr ""
670+
671+#: ../libertine/qml/ManageContainer.qml:86
672+msgid "Update container"
673+msgstr ""
674+
675 #: ../libertine/qml/HomeView.qml:27
676 msgid "Classic Apps - %1"
677 msgstr ""
678@@ -231,11 +256,11 @@
679 msgstr ""
680
681 #: ../libertine/qml/HomeView.qml:102
682-msgid "Configure Container"
683+msgid "Manage Container"
684 msgstr ""
685
686 #: ../libertine/qml/HomeView.qml:108
687-msgid "Update Container"
688+msgid "Container Information"
689 msgstr ""
690
691 #: ../libertine/qml/HomeView.qml:114
692@@ -254,14 +279,53 @@
693 msgid "Search archives for a package"
694 msgstr ""
695
696-#: ../libertine/qml/HomeView.qml:188
697+#: ../libertine/qml/HomeView.qml:196
698 msgid "Remove Package"
699 msgstr ""
700
701-#: ../libertine/qml/HomeView.qml:202
702+#: ../libertine/qml/HomeView.qml:209
703 msgid "Package Info"
704 msgstr ""
705
706+#: ../libertine/qml/HomeView.qml:227
707+msgid "No packages are installed"
708+msgstr ""
709+
710+#: ../libertine/qml/PackageInfoView.qml:28
711+msgid "Information for the %1 package"
712+msgstr ""
713+
714+#: ../libertine/qml/PackageInfoView.qml:32
715+msgid "Obtaining package version…"
716+msgstr ""
717+
718+#: ../libertine/qml/PackageInfoView.qml:49
719+msgid "Package version"
720+msgstr ""
721+
722+#: ../libertine/qml/PackageInfoView.qml:56
723+msgid "Install status"
724+msgstr ""
725+
726+#: ../libertine/qml/WelcomeView.qml:27
727+msgid "Welcome"
728+msgstr ""
729+
730+#: ../libertine/qml/WelcomeView.qml:42
731+msgid "Welcome to the Ubuntu Legacy Application Support Manager."
732+msgstr ""
733+
734+#: ../libertine/qml/WelcomeView.qml:50
735+msgid ""
736+"You do not have Legacy Application Support configured at this time. "
737+"Downloading and setting up the required environment takes some time and "
738+"network bandwidth."
739+msgstr ""
740+
741+#: ../libertine/qml/WelcomeView.qml:58
742+msgid "Install"
743+msgstr ""
744+
745 #: ../libertine/qml/ExtraArchivesView.qml:26
746 msgid "Additional Archives and PPAs"
747 msgstr ""
748@@ -282,73 +346,34 @@
749 msgid "Enter name of PPA in the form ppa:user/ppa-name:"
750 msgstr ""
751
752-#: ../libertine/qml/ExtraArchivesView.qml:96
753+#: ../libertine/qml/ExtraArchivesView.qml:101
754 msgid "remove"
755 msgstr ""
756
757-#: ../libertine/qml/ExtraArchivesView.qml:97
758+#: ../libertine/qml/ExtraArchivesView.qml:102
759 msgid "Remove extra archive"
760 msgstr ""
761
762-#: ../libertine/qml/ExtraArchivesView.qml:133
763+#: ../libertine/qml/ExtraArchivesView.qml:119
764+msgid "No additional archives and PPA's have been added"
765+msgstr ""
766+
767+#: ../libertine/qml/ExtraArchivesView.qml:148
768 msgid "Adding archive failed"
769 msgstr ""
770
771-#: ../libertine/qml/ExtraArchivesView.qml:137
772-msgid "Dismiss"
773-msgstr ""
774-
775-#: ../libertine/qml/WelcomeView.qml:27
776-msgid "Welcome"
777-msgstr ""
778-
779-#: ../libertine/qml/WelcomeView.qml:42
780-msgid "Welcome to the Ubuntu Legacy Application Support Manager."
781-msgstr ""
782-
783-#: ../libertine/qml/WelcomeView.qml:50
784-msgid ""
785-"You do not have Legacy Application Support configured at this time. "
786-"Downloading and setting up the required environment takes some time and "
787-"network bandwidth."
788-msgstr ""
789-
790-#: ../libertine/qml/WelcomeView.qml:58
791-msgid "Install"
792-msgstr ""
793-
794-#: ../libertine/qml/ContainerInfoView.qml:28
795-msgid "Container information for %1"
796-msgstr ""
797-
798-#: ../libertine/qml/ContainerInfoView.qml:48
799-msgid "ID"
800-msgstr ""
801-
802-#: ../libertine/qml/ContainerInfoView.qml:55
803-msgid "Name"
804-msgstr ""
805-
806-#: ../libertine/qml/ContainerInfoView.qml:62
807-msgid "Distribution"
808-msgstr ""
809-
810-#: ../libertine/qml/ContainerInfoView.qml:69
811-msgid "Status"
812-msgstr ""
813-
814-#: ../libertine/qml/ContainerOptionsDialog.qml:27
815-msgid "Container Options"
816-msgstr ""
817-
818-#: ../libertine/qml/ContainerOptionsDialog.qml:28
819-msgid "Configure options for container creation."
820-msgstr ""
821-
822-#: ../libertine/qml/ContainerOptionsDialog.qml:50
823-msgid "Enter or name for the container or leave blank for default name"
824-msgstr ""
825-
826-#: ../libertine/qml/ContainerOptionsDialog.qml:56
827-msgid "container name"
828+#: ../libertine/qml/PackageExistsDialog.qml:28
829+msgid "The %1 package is already installed."
830+msgstr ""
831+
832+#: ../libertine/qml/PackageExistsDialog.qml:29
833+msgid "Search again or return to search results."
834+msgstr ""
835+
836+#: ../libertine/qml/PackageExistsDialog.qml:33
837+msgid "Search again"
838+msgstr ""
839+
840+#: ../libertine/qml/PackageExistsDialog.qml:43
841+msgid "Return to search results"
842 msgstr ""
843
844=== modified file 'python/libertine/Libertine.py'
845--- python/libertine/Libertine.py 2016-04-18 15:20:57 +0000
846+++ python/libertine/Libertine.py 2016-04-22 16:16:24 +0000
847@@ -56,7 +56,9 @@
848
849
850 def apt_command_prefix(verbosity):
851- return '/usr/bin/apt ' + apt_args_for_verbosity_level(verbosity) + ' --option Apt::Cmd::Disable-Script-Warning=true '
852+ return '/usr/bin/apt-get ' + apt_args_for_verbosity_level(verbosity) + \
853+ ' --option Apt::Cmd::Disable-Script-Warning=true --option Dpkg::Progress-Fancy=1' + \
854+ ' --option Apt::Color=1 '
855
856
857 def handle_runtime_error(error):
858@@ -341,7 +343,7 @@
859 """
860 try:
861 with ContainerRunning(self.container):
862- if not self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") == 0:
863+ if self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") != 0:
864 return False
865 return self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0
866 except RuntimeError as e:
867@@ -368,7 +370,7 @@
868 ubuntu-app-launch
869 """
870 if libertine.utils.container_exists(self.container.container_id):
871- self.container.launch_application(app_exec_line)
872+ self.container.launch_application(app_exec_line)
873 else:
874 raise RuntimeError("Container with id %s does not exist." % self.container.container_id)
875
876
877=== modified file 'tools/libertine-container-manager'
878--- tools/libertine-container-manager 2016-04-19 19:07:37 +0000
879+++ tools/libertine-container-manager 2016-04-22 16:16:24 +0000
880@@ -422,7 +422,7 @@
881 update_package_install_status(args.id, args.package, "removing")
882
883 if not container.remove_package(args.package, args.verbosity):
884- update_package_install_status(args.id, package, "installed")
885+ update_package_install_status(args.id, args.package, "installed")
886 sys.exit(1)
887
888 update_package_install_status(args.id, args.package, "removed")

Subscribers

People subscribed via source and target branches