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 (community) 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
=== modified file 'po/en_US.po'
--- po/en_US.po 2016-04-08 20:16:41 +0000
+++ po/en_US.po 2016-04-22 16:16:24 +0000
@@ -7,7 +7,7 @@
7msgstr ""7msgstr ""
8"Project-Id-Version: PACKAGE VERSION\n"8"Project-Id-Version: PACKAGE VERSION\n"
9"Report-Msgid-Bugs-To: \n"9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2016-04-08 16:01-0400\n"10"POT-Creation-Date: 2016-04-22 09:44-0400\n"
11"PO-Revision-Date: 2016-03-21 10:21-0400\n"11"PO-Revision-Date: 2016-03-21 10:21-0400\n"
12"Last-Translator: Chris Townsend <christopher.townsend@canonical.com>\n"12"Last-Translator: Chris Townsend <christopher.townsend@canonical.com>\n"
13"Language-Team: English\n"13"Language-Team: English\n"
@@ -25,7 +25,7 @@
25msgid "Add additional PPA"25msgid "Add additional PPA"
26msgstr ""26msgstr ""
2727
28#: ../libertine/qml/ExtraArchivesView.qml:13328#: ../libertine/qml/ExtraArchivesView.qml:148
29msgid "Adding archive failed"29msgid "Adding archive failed"
30msgstr ""30msgstr ""
3131
@@ -33,7 +33,7 @@
33msgid "Additional Archives and PPAs"33msgid "Additional Archives and PPAs"
34msgstr ""34msgstr ""
3535
36#: ../libertine/qml/ConfigureContainer.qml:5936#: ../libertine/qml/ManageContainer.qml:59
37msgid "Additional archives and PPAs"37msgid "Additional archives and PPAs"
38msgstr ""38msgstr ""
3939
@@ -41,14 +41,14 @@
41msgid "Authentication required"41msgid "Authentication required"
42msgstr ""42msgstr ""
4343
44#: ../libertine/qml/DebianPackagePicker.qml:744#: ../libertine/qml/DebianPackagePicker.qml:26
45msgid "Available Debian Packages to Install"45msgid "Available Debian Packages to Install"
46msgstr ""46msgstr ""
4747
48#: ../libertine/qml/ContainerOptionsDialog.qml:75
49#: ../libertine/qml/ContainerPasswordDialog.qml:70
48#: ../libertine/qml/SearchPackagesDialog.qml:5750#: ../libertine/qml/SearchPackagesDialog.qml:57
49#: ../libertine/qml/ContainerPasswordDialog.qml:70
50#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:6251#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
51#: ../libertine/qml/ContainerOptionsDialog.qml:75
52msgid "Cancel"52msgid "Cancel"
53msgstr ""53msgstr ""
5454
@@ -60,27 +60,24 @@
60msgid "Classic Apps - %1"60msgid "Classic Apps - %1"
61msgstr "Classic Apps - %1"61msgstr "Classic Apps - %1"
6262
63#: ../libertine/qml/ConfigureContainer.qml:27
64msgid "Configure %1"
65msgstr "Configure %1"
66
67#: ../libertine/qml/HomeView.qml:102
68msgid "Configure Container"
69msgstr "Configure Container"
70
71#: ../libertine/qml/ContainerOptionsDialog.qml:2863#: ../libertine/qml/ContainerOptionsDialog.qml:28
72#, fuzzy64#, fuzzy
73msgid "Configure options for container creation."65msgid "Configure options for container creation."
74msgstr "Configure Container"66msgstr "Configure Container"
7567
76#: ../libertine/qml/ContainersView.qml:9668#: ../libertine/qml/ContainersView.qml:100
77msgid "Container Apps"69msgid "Container Apps"
78msgstr "Container Apps"70msgstr "Container Apps"
7971
80#: ../libertine/qml/ContainersView.qml:8772#: ../libertine/qml/ContainersView.qml:91
81msgid "Container Info"73msgid "Container Info"
82msgstr "Container Info"74msgstr "Container Info"
8375
76#: ../libertine/qml/HomeView.qml:108
77#, fuzzy
78msgid "Container Information"
79msgstr "Container information for %1"
80
84#: ../libertine/qml/ContainerOptionsDialog.qml:2781#: ../libertine/qml/ContainerOptionsDialog.qml:27
85#, fuzzy82#, fuzzy
86msgid "Container Options"83msgid "Container Options"
@@ -90,11 +87,12 @@
90msgid "Container information for %1"87msgid "Container information for %1"
91msgstr "Container information for %1"88msgstr "Container information for %1"
9289
93#: ../libertine/qml/ContainersView.qml:6990#: ../libertine/qml/ContainersView.qml:73
94msgid "Delete Container"91msgid "Delete Container"
95msgstr "Delete Container"92msgstr "Delete Container"
9693
97#: ../libertine/qml/ExtraArchivesView.qml:13794#: ../libertine/qml/PackageOperationFailureDialog.qml:33
95#: ../libertine/qml/ExtraArchivesView.qml:152
98msgid "Dismiss"96msgid "Dismiss"
99msgstr ""97msgstr ""
10098
@@ -121,9 +119,11 @@
121msgid "Enter package name or Debian file"119msgid "Enter package name or Debian file"
122msgstr "Please enter the exact package name of the app to install:"120msgstr "Please enter the exact package name of the app to install:"
123121
124#: ../libertine/qml/PackageInfoView.qml:66122#. Either "installing" or "removing"
125msgid "Failure reason"123#: ../libertine/qml/PackageOperationFailureDialog.qml:29
126msgstr ""124#, fuzzy
125msgid "Failure %1 the %2 package."
126msgstr "Information for the %1 package"
127127
128#: ../libertine/qml/ContainerInfoView.qml:48128#: ../libertine/qml/ContainerInfoView.qml:48
129msgid "ID"129msgid "ID"
@@ -137,8 +137,8 @@
137msgid "Install"137msgid "Install"
138msgstr "Install"138msgstr "Install"
139139
140#: ../libertine/qml/DebianPackagePicker.qml:53
140#: ../libertine/qml/SearchResults.qml:42141#: ../libertine/qml/SearchResults.qml:42
141#: ../libertine/qml/DebianPackagePicker.qml:34
142msgid "Install Package"142msgid "Install Package"
143msgstr "Install Package"143msgstr "Install Package"
144144
@@ -147,7 +147,7 @@
147msgid "Install new package"147msgid "Install new package"
148msgstr "Install Package"148msgstr "Install Package"
149149
150#: ../libertine/qml/PackageInfoView.qml:58150#: ../libertine/qml/PackageInfoView.qml:56
151#, fuzzy151#, fuzzy
152msgid "Install status"152msgid "Install status"
153msgstr "Install status: %1"153msgstr "Install status: %1"
@@ -156,6 +156,15 @@
156msgid "Invalid password entered"156msgid "Invalid password entered"
157msgstr ""157msgstr ""
158158
159#: ../libertine/qml/ManageContainer.qml:27
160msgid "Manage %1"
161msgstr ""
162
163#: ../libertine/qml/HomeView.qml:102
164#, fuzzy
165msgid "Manage Container"
166msgstr "My Containers"
167
159#: ../libertine/qml/ContainersView.qml:31168#: ../libertine/qml/ContainersView.qml:31
160msgid "My Containers"169msgid "My Containers"
161msgstr "My Containers"170msgstr "My Containers"
@@ -165,7 +174,7 @@
165msgid "Name"174msgid "Name"
166msgstr "Name: %1"175msgstr "Name: %1"
167176
168#: ../libertine/qml/DebianPackagePicker.qml:53177#: ../libertine/qml/DebianPackagePicker.qml:72
169msgid "No Debian packages available"178msgid "No Debian packages available"
170msgstr ""179msgstr ""
171180
@@ -174,18 +183,27 @@
174msgid "No Search Results Found"183msgid "No Search Results Found"
175msgstr "No search results for %1."184msgstr "No search results for %1."
176185
186#: ../libertine/qml/ExtraArchivesView.qml:119
187msgid "No additional archives and PPA's have been added"
188msgstr ""
189
190#: ../libertine/qml/HomeView.qml:227
191#, fuzzy
192msgid "No packages are installed"
193msgstr "Please enter the exact package name of the app to install:"
194
195#: ../libertine/qml/ContainerOptionsDialog.qml:64
196#: ../libertine/qml/ContainerPasswordDialog.qml:52
177#: ../libertine/qml/SearchPackagesDialog.qml:39197#: ../libertine/qml/SearchPackagesDialog.qml:39
178#: ../libertine/qml/ContainerPasswordDialog.qml:52
179#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54198#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
180#: ../libertine/qml/ContainerOptionsDialog.qml:64
181msgid "OK"199msgid "OK"
182msgstr ""200msgstr ""
183201
184#: ../libertine/qml/PackageInfoView.qml:33202#: ../libertine/qml/PackageInfoView.qml:32
185msgid "Obtaining package version…"203msgid "Obtaining package version…"
186msgstr "Obtaining package version…"204msgstr "Obtaining package version…"
187205
188#: ../libertine/qml/HomeView.qml:202206#: ../libertine/qml/HomeView.qml:209
189msgid "Package Info"207msgid "Package Info"
190msgstr "Package Info"208msgstr "Package Info"
191209
@@ -197,7 +215,7 @@
197msgid "Package name or Debian package path"215msgid "Package name or Debian package path"
198msgstr ""216msgstr ""
199217
200#: ../libertine/qml/PackageInfoView.qml:51218#: ../libertine/qml/PackageInfoView.qml:49
201#, fuzzy219#, fuzzy
202msgid "Package version"220msgid "Package version"
203msgstr "Package version: %1"221msgstr "Package version: %1"
@@ -206,11 +224,11 @@
206msgid "Password is required to create a Libertine container"224msgid "Password is required to create a Libertine container"
207msgstr ""225msgstr ""
208226
209#: ../libertine/qml/HomeView.qml:188227#: ../libertine/qml/HomeView.qml:196
210msgid "Remove Package"228msgid "Remove Package"
211msgstr "Remove Package"229msgstr "Remove Package"
212230
213#: ../libertine/qml/ExtraArchivesView.qml:97231#: ../libertine/qml/ExtraArchivesView.qml:102
214msgid "Remove extra archive"232msgid "Remove extra archive"
215msgstr ""233msgstr ""
216234
@@ -247,12 +265,12 @@
247msgid "Search archives for packages"265msgid "Search archives for packages"
248msgstr ""266msgstr ""
249267
268#: ../libertine/qml/SearchResultsView.qml:39
250#: ../libertine/qml/SearchPackagesDialog.qml:26269#: ../libertine/qml/SearchPackagesDialog.qml:26
251#: ../libertine/qml/SearchResultsView.qml:39
252msgid "Search for packages"270msgid "Search for packages"
253msgstr ""271msgstr ""
254272
255#: ../libertine/qml/SearchResultsView.qml:90273#: ../libertine/qml/SearchResultsView.qml:92
256#, fuzzy274#, fuzzy
257msgid "Searching for packages…"275msgid "Searching for packages…"
258msgstr "Obtaining package version…"276msgstr "Obtaining package version…"
@@ -277,10 +295,15 @@
277"The %1 package is already installed. Please try a different package name."295"The %1 package is already installed. Please try a different package name."
278msgstr "Package %1 already installed. Please try a different package name."296msgstr "Package %1 already installed. Please try a different package name."
279297
280#: ../libertine/qml/HomeView.qml:108298#: ../libertine/qml/ManageContainer.qml:86
281msgid "Update Container"299#, fuzzy
300msgid "Update container"
282msgstr "Update Container"301msgstr "Update Container"
283302
303#: ../libertine/qml/ManageContainer.qml:70
304msgid "Update…"
305msgstr ""
306
284#: ../libertine/qml/WelcomeView.qml:27307#: ../libertine/qml/WelcomeView.qml:27
285msgid "Welcome"308msgid "Welcome"
286msgstr "Welcome"309msgstr "Welcome"
@@ -308,39 +331,38 @@
308msgid "container name"331msgid "container name"
309msgstr "Container Info"332msgstr "Container Info"
310333
311#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187334#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
312msgid "delete"335msgid "delete"
313msgstr "delete"336msgstr "delete"
314337
315#: ../libertine/qml/ContainersView.qml:95338#: ../libertine/qml/ContainersView.qml:99
316msgid "edit"339msgid "edit"
317msgstr "edit"340msgstr "edit"
318341
319#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:186342#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
320#: ../libertine/qml/PackageInfoView.qml:120
321msgid "failed"343msgid "failed"
322msgstr "failed"344msgstr "failed"
323345
324#: ../libertine/qml/ConfigureContainer.qml:55
325#: ../libertine/qml/ContainerOptionsDialog.qml:40346#: ../libertine/qml/ContainerOptionsDialog.qml:40
347#: ../libertine/qml/ManageContainer.qml:55
326msgid "i386 multiarch support"348msgid "i386 multiarch support"
327msgstr "i386 multiarch support"349msgstr "i386 multiarch support"
328350
329#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201351#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
330msgid "info"352msgid "info"
331msgstr "info"353msgstr "info"
332354
333#: ../libertine/ContainerConfig.cpp:185355#: ../libertine/ContainerConfig.cpp:186
334msgid "installed"356msgid "installed"
335msgstr "installed"357msgstr "installed"
336358
337#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:184359#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
338#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:171360#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
339#: ../libertine/qml/ExtraArchivesView.qml:80361#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
340msgid "installing"362msgid "installing"
341msgstr "installing"363msgstr "installing"
342364
343#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:183365#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
344msgid "new"366msgid "new"
345msgstr "new"367msgstr "new"
346368
@@ -349,24 +371,26 @@
349msgid "password"371msgid "password"
350msgstr "Password"372msgstr "Password"
351373
352#: ../libertine/ContainerConfig.cpp:149374#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
375#: ../libertine/qml/ManageContainer.qml:71
376#: ../libertine/qml/ManageContainer.qml:111
353msgid "ready"377msgid "ready"
354msgstr "ready"378msgstr "ready"
355379
356#: ../libertine/qml/ExtraArchivesView.qml:96380#: ../libertine/qml/ExtraArchivesView.qml:101
357#, fuzzy381#, fuzzy
358msgid "remove"382msgid "remove"
359msgstr "removed"383msgstr "removed"
360384
361#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188385#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
362#: ../libertine/qml/PackageInfoView.qml:110
363#: ../libertine/qml/ContainerInfoView.qml:88386#: ../libertine/qml/ContainerInfoView.qml:88
387#: ../libertine/qml/PackageInfoView.qml:85
364msgid "removed"388msgid "removed"
365msgstr "removed"389msgstr "removed"
366390
367#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:187391#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
368#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:172392#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
369#: ../libertine/qml/ExtraArchivesView.qml:81393#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
370msgid "removing"394msgid "removing"
371msgstr "removing"395msgstr "removing"
372396
@@ -374,6 +398,18 @@
374msgid "search"398msgid "search"
375msgstr ""399msgstr ""
376400
401#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
402#: ../libertine/qml/ManageContainer.qml:83
403#: ../libertine/qml/ManageContainer.qml:107
404msgid "updating"
405msgstr ""
406
407#~ msgid "Configure %1"
408#~ msgstr "Configure %1"
409
410#~ msgid "Configure Container"
411#~ msgstr "Configure Container"
412
377#~ msgid "ID: %1"413#~ msgid "ID: %1"
378#~ msgstr "ID: %1"414#~ msgstr "ID: %1"
379415
380416
=== modified file 'po/libertine.pot'
--- po/libertine.pot 2016-04-08 20:16:41 +0000
+++ po/libertine.pot 2016-04-22 16:16:24 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-04-08 16:01-0400\n"11"POT-Creation-Date: 2016-04-22 09:44-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,145 +17,83 @@
17"Content-Type: text/plain; charset=UTF-8\n"17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:18320#: ../libertine/ContainerConfig.cpp:147 ../libertine/ContainerConfig.cpp:184
21msgid "new"21msgid "new"
22msgstr ""22msgstr ""
2323
24#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:18424#: ../libertine/ContainerConfig.cpp:148 ../libertine/ContainerConfig.cpp:185
25#: ../libertine/qml/ContainersView.qml:51 ../libertine/qml/HomeView.qml:17125#: ../libertine/qml/libertine.qml:58 ../libertine/qml/ContainersView.qml:63
26#: ../libertine/qml/ExtraArchivesView.qml:8026#: ../libertine/qml/HomeView.qml:187 ../libertine/qml/ExtraArchivesView.qml:93
27msgid "installing"27msgid "installing"
28msgstr ""28msgstr ""
2929
30#: ../libertine/ContainerConfig.cpp:14930#: ../libertine/ContainerConfig.cpp:149 ../libertine/qml/ContainersView.qml:101
31#: ../libertine/qml/ManageContainer.qml:71
32#: ../libertine/qml/ManageContainer.qml:111
31msgid "ready"33msgid "ready"
32msgstr ""34msgstr ""
3335
34#: ../libertine/ContainerConfig.cpp:150 ../libertine/ContainerConfig.cpp:18736#: ../libertine/ContainerConfig.cpp:150 ../libertine/qml/ContainersView.qml:102
35#: ../libertine/qml/ContainersView.qml:52 ../libertine/qml/HomeView.qml:17237#: ../libertine/qml/ManageContainer.qml:83
36#: ../libertine/qml/ExtraArchivesView.qml:8138#: ../libertine/qml/ManageContainer.qml:107
39msgid "updating"
40msgstr ""
41
42#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:188
43#: ../libertine/qml/libertine.qml:65 ../libertine/qml/ContainersView.qml:64
44#: ../libertine/qml/HomeView.qml:188 ../libertine/qml/ExtraArchivesView.qml:94
37msgid "removing"45msgid "removing"
38msgstr ""46msgstr ""
3947
40#: ../libertine/ContainerConfig.cpp:151 ../libertine/ContainerConfig.cpp:18848#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:189
41#: ../libertine/qml/PackageInfoView.qml:110
42#: ../libertine/qml/ContainerInfoView.qml:8849#: ../libertine/qml/ContainerInfoView.qml:88
50#: ../libertine/qml/PackageInfoView.qml:85
43msgid "removed"51msgid "removed"
44msgstr ""52msgstr ""
4553
46#: ../libertine/ContainerConfig.cpp:152 ../libertine/ContainerConfig.cpp:18654#: ../libertine/ContainerConfig.cpp:153 ../libertine/ContainerConfig.cpp:187
47#: ../libertine/qml/PackageInfoView.qml:120
48msgid "failed"55msgid "failed"
49msgstr ""56msgstr ""
5057
51#: ../libertine/ContainerConfig.cpp:18558#: ../libertine/ContainerConfig.cpp:186
52msgid "installed"59msgid "installed"
53msgstr ""60msgstr ""
5461
55#: ../libertine/qml/PackageExistsDialog.qml:2862#: ../libertine/qml/ContainerOptionsDialog.qml:27
56msgid "The %1 package is already installed."63msgid "Container Options"
57msgstr ""64msgstr ""
5865
59#: ../libertine/qml/PackageExistsDialog.qml:2966#: ../libertine/qml/ContainerOptionsDialog.qml:28
60msgid "Search again or return to search results."67msgid "Configure options for container creation."
61msgstr ""68msgstr ""
6269
63#: ../libertine/qml/PackageExistsDialog.qml:33
64msgid "Search again"
65msgstr ""
66
67#: ../libertine/qml/PackageExistsDialog.qml:43
68msgid "Return to search results"
69msgstr ""
70
71#: ../libertine/qml/ContainersView.qml:31
72msgid "My Containers"
73msgstr ""
74
75#: ../libertine/qml/ContainersView.qml:68 ../libertine/qml/HomeView.qml:187
76msgid "delete"
77msgstr ""
78
79#: ../libertine/qml/ContainersView.qml:69
80msgid "Delete Container"
81msgstr ""
82
83#: ../libertine/qml/ContainersView.qml:86 ../libertine/qml/HomeView.qml:201
84msgid "info"
85msgstr ""
86
87#: ../libertine/qml/ContainersView.qml:87
88msgid "Container Info"
89msgstr ""
90
91#: ../libertine/qml/ContainersView.qml:95
92msgid "edit"
93msgstr ""
94
95#: ../libertine/qml/ContainersView.qml:96
96msgid "Container Apps"
97msgstr ""
98
99#: ../libertine/qml/ConfigureContainer.qml:27
100msgid "Configure %1"
101msgstr ""
102
103#: ../libertine/qml/ConfigureContainer.qml:55
104#: ../libertine/qml/ContainerOptionsDialog.qml:4070#: ../libertine/qml/ContainerOptionsDialog.qml:40
71#: ../libertine/qml/ManageContainer.qml:55
105msgid "i386 multiarch support"72msgid "i386 multiarch support"
106msgstr ""73msgstr ""
10774
108#: ../libertine/qml/ConfigureContainer.qml:5975#: ../libertine/qml/ContainerOptionsDialog.qml:50
109msgid "Additional archives and PPAs"76msgid "Enter or name for the container or leave blank for default name"
110msgstr ""77msgstr ""
11178
112#: ../libertine/qml/SearchPackagesDialog.qml:2679#: ../libertine/qml/ContainerOptionsDialog.qml:56
113#: ../libertine/qml/SearchResultsView.qml:3980msgid "container name"
114msgid "Search for packages"81msgstr ""
115msgstr ""82
11683#: ../libertine/qml/ContainerOptionsDialog.qml:64
117#: ../libertine/qml/SearchPackagesDialog.qml:2784#: ../libertine/qml/ContainerPasswordDialog.qml:52
118msgid "Search archives for packages"
119msgstr ""
120
121#: ../libertine/qml/SearchPackagesDialog.qml:31
122msgid "search"
123msgstr ""
124
125#: ../libertine/qml/SearchPackagesDialog.qml:3985#: ../libertine/qml/SearchPackagesDialog.qml:39
126#: ../libertine/qml/ContainerPasswordDialog.qml:52
127#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:5486#: ../libertine/qml/HomeView.qml:65 ../libertine/qml/ExtraArchivesView.qml:54
128#: ../libertine/qml/ContainerOptionsDialog.qml:64
129msgid "OK"87msgid "OK"
130msgstr ""88msgstr ""
13189
90#: ../libertine/qml/ContainerOptionsDialog.qml:75
91#: ../libertine/qml/ContainerPasswordDialog.qml:70
132#: ../libertine/qml/SearchPackagesDialog.qml:5792#: ../libertine/qml/SearchPackagesDialog.qml:57
133#: ../libertine/qml/ContainerPasswordDialog.qml:70
134#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:6293#: ../libertine/qml/HomeView.qml:86 ../libertine/qml/ExtraArchivesView.qml:62
135#: ../libertine/qml/ContainerOptionsDialog.qml:75
136msgid "Cancel"94msgid "Cancel"
137msgstr ""95msgstr ""
13896
139#: ../libertine/qml/PackageInfoView.qml:28
140msgid "Information for the %1 package"
141msgstr ""
142
143#: ../libertine/qml/PackageInfoView.qml:33
144msgid "Obtaining package version…"
145msgstr ""
146
147#: ../libertine/qml/PackageInfoView.qml:51
148msgid "Package version"
149msgstr ""
150
151#: ../libertine/qml/PackageInfoView.qml:58
152msgid "Install status"
153msgstr ""
154
155#: ../libertine/qml/PackageInfoView.qml:66
156msgid "Failure reason"
157msgstr ""
158
159#: ../libertine/qml/SearchResultsView.qml:2897#: ../libertine/qml/SearchResultsView.qml:28
160msgid "Package Search Results"98msgid "Package Search Results"
161msgstr ""99msgstr ""
@@ -164,6 +102,11 @@
164msgid "Search"102msgid "Search"
165msgstr ""103msgstr ""
166104
105#: ../libertine/qml/SearchResultsView.qml:39
106#: ../libertine/qml/SearchPackagesDialog.qml:26
107msgid "Search for packages"
108msgstr ""
109
167#: ../libertine/qml/SearchResultsView.qml:49110#: ../libertine/qml/SearchResultsView.qml:49
168msgid "No Search Results Found"111msgid "No Search Results Found"
169msgstr ""112msgstr ""
@@ -176,20 +119,20 @@
176msgid "Return to Apps Page"119msgid "Return to Apps Page"
177msgstr ""120msgstr ""
178121
179#: ../libertine/qml/SearchResultsView.qml:90122#: ../libertine/qml/SearchResultsView.qml:92
180msgid "Searching for packages…"123msgid "Searching for packages…"
181msgstr ""124msgstr ""
182125
126#: ../libertine/qml/DebianPackagePicker.qml:26
127msgid "Available Debian Packages to Install"
128msgstr ""
129
130#: ../libertine/qml/DebianPackagePicker.qml:53
183#: ../libertine/qml/SearchResults.qml:42131#: ../libertine/qml/SearchResults.qml:42
184#: ../libertine/qml/DebianPackagePicker.qml:34
185msgid "Install Package"132msgid "Install Package"
186msgstr ""133msgstr ""
187134
188#: ../libertine/qml/DebianPackagePicker.qml:7135#: ../libertine/qml/DebianPackagePicker.qml:72
189msgid "Available Debian Packages to Install"
190msgstr ""
191
192#: ../libertine/qml/DebianPackagePicker.qml:53
193msgid "No Debian packages available"136msgid "No Debian packages available"
194msgstr ""137msgstr ""
195138
@@ -209,6 +152,88 @@
209msgid "password"152msgid "password"
210msgstr ""153msgstr ""
211154
155#: ../libertine/qml/ContainerInfoView.qml:28
156msgid "Container information for %1"
157msgstr ""
158
159#: ../libertine/qml/ContainerInfoView.qml:48
160msgid "ID"
161msgstr ""
162
163#: ../libertine/qml/ContainerInfoView.qml:55
164msgid "Name"
165msgstr ""
166
167#: ../libertine/qml/ContainerInfoView.qml:62
168msgid "Distribution"
169msgstr ""
170
171#: ../libertine/qml/ContainerInfoView.qml:69
172msgid "Status"
173msgstr ""
174
175#. Either "installing" or "removing"
176#: ../libertine/qml/PackageOperationFailureDialog.qml:29
177msgid "Failure %1 the %2 package."
178msgstr ""
179
180#: ../libertine/qml/PackageOperationFailureDialog.qml:33
181#: ../libertine/qml/ExtraArchivesView.qml:152
182msgid "Dismiss"
183msgstr ""
184
185#: ../libertine/qml/ContainersView.qml:31
186msgid "My Containers"
187msgstr ""
188
189#: ../libertine/qml/ContainersView.qml:72 ../libertine/qml/HomeView.qml:195
190msgid "delete"
191msgstr ""
192
193#: ../libertine/qml/ContainersView.qml:73
194msgid "Delete Container"
195msgstr ""
196
197#: ../libertine/qml/ContainersView.qml:90 ../libertine/qml/HomeView.qml:208
198msgid "info"
199msgstr ""
200
201#: ../libertine/qml/ContainersView.qml:91
202msgid "Container Info"
203msgstr ""
204
205#: ../libertine/qml/ContainersView.qml:99
206msgid "edit"
207msgstr ""
208
209#: ../libertine/qml/ContainersView.qml:100
210msgid "Container Apps"
211msgstr ""
212
213#: ../libertine/qml/SearchPackagesDialog.qml:27
214msgid "Search archives for packages"
215msgstr ""
216
217#: ../libertine/qml/SearchPackagesDialog.qml:31
218msgid "search"
219msgstr ""
220
221#: ../libertine/qml/ManageContainer.qml:27
222msgid "Manage %1"
223msgstr ""
224
225#: ../libertine/qml/ManageContainer.qml:59
226msgid "Additional archives and PPAs"
227msgstr ""
228
229#: ../libertine/qml/ManageContainer.qml:70
230msgid "Update…"
231msgstr ""
232
233#: ../libertine/qml/ManageContainer.qml:86
234msgid "Update container"
235msgstr ""
236
212#: ../libertine/qml/HomeView.qml:27237#: ../libertine/qml/HomeView.qml:27
213msgid "Classic Apps - %1"238msgid "Classic Apps - %1"
214msgstr ""239msgstr ""
@@ -231,11 +256,11 @@
231msgstr ""256msgstr ""
232257
233#: ../libertine/qml/HomeView.qml:102258#: ../libertine/qml/HomeView.qml:102
234msgid "Configure Container"259msgid "Manage Container"
235msgstr ""260msgstr ""
236261
237#: ../libertine/qml/HomeView.qml:108262#: ../libertine/qml/HomeView.qml:108
238msgid "Update Container"263msgid "Container Information"
239msgstr ""264msgstr ""
240265
241#: ../libertine/qml/HomeView.qml:114266#: ../libertine/qml/HomeView.qml:114
@@ -254,14 +279,53 @@
254msgid "Search archives for a package"279msgid "Search archives for a package"
255msgstr ""280msgstr ""
256281
257#: ../libertine/qml/HomeView.qml:188282#: ../libertine/qml/HomeView.qml:196
258msgid "Remove Package"283msgid "Remove Package"
259msgstr ""284msgstr ""
260285
261#: ../libertine/qml/HomeView.qml:202286#: ../libertine/qml/HomeView.qml:209
262msgid "Package Info"287msgid "Package Info"
263msgstr ""288msgstr ""
264289
290#: ../libertine/qml/HomeView.qml:227
291msgid "No packages are installed"
292msgstr ""
293
294#: ../libertine/qml/PackageInfoView.qml:28
295msgid "Information for the %1 package"
296msgstr ""
297
298#: ../libertine/qml/PackageInfoView.qml:32
299msgid "Obtaining package version…"
300msgstr ""
301
302#: ../libertine/qml/PackageInfoView.qml:49
303msgid "Package version"
304msgstr ""
305
306#: ../libertine/qml/PackageInfoView.qml:56
307msgid "Install status"
308msgstr ""
309
310#: ../libertine/qml/WelcomeView.qml:27
311msgid "Welcome"
312msgstr ""
313
314#: ../libertine/qml/WelcomeView.qml:42
315msgid "Welcome to the Ubuntu Legacy Application Support Manager."
316msgstr ""
317
318#: ../libertine/qml/WelcomeView.qml:50
319msgid ""
320"You do not have Legacy Application Support configured at this time. "
321"Downloading and setting up the required environment takes some time and "
322"network bandwidth."
323msgstr ""
324
325#: ../libertine/qml/WelcomeView.qml:58
326msgid "Install"
327msgstr ""
328
265#: ../libertine/qml/ExtraArchivesView.qml:26329#: ../libertine/qml/ExtraArchivesView.qml:26
266msgid "Additional Archives and PPAs"330msgid "Additional Archives and PPAs"
267msgstr ""331msgstr ""
@@ -282,73 +346,34 @@
282msgid "Enter name of PPA in the form ppa:user/ppa-name:"346msgid "Enter name of PPA in the form ppa:user/ppa-name:"
283msgstr ""347msgstr ""
284348
285#: ../libertine/qml/ExtraArchivesView.qml:96349#: ../libertine/qml/ExtraArchivesView.qml:101
286msgid "remove"350msgid "remove"
287msgstr ""351msgstr ""
288352
289#: ../libertine/qml/ExtraArchivesView.qml:97353#: ../libertine/qml/ExtraArchivesView.qml:102
290msgid "Remove extra archive"354msgid "Remove extra archive"
291msgstr ""355msgstr ""
292356
293#: ../libertine/qml/ExtraArchivesView.qml:133357#: ../libertine/qml/ExtraArchivesView.qml:119
358msgid "No additional archives and PPA's have been added"
359msgstr ""
360
361#: ../libertine/qml/ExtraArchivesView.qml:148
294msgid "Adding archive failed"362msgid "Adding archive failed"
295msgstr ""363msgstr ""
296364
297#: ../libertine/qml/ExtraArchivesView.qml:137365#: ../libertine/qml/PackageExistsDialog.qml:28
298msgid "Dismiss"366msgid "The %1 package is already installed."
299msgstr ""367msgstr ""
300368
301#: ../libertine/qml/WelcomeView.qml:27369#: ../libertine/qml/PackageExistsDialog.qml:29
302msgid "Welcome"370msgid "Search again or return to search results."
303msgstr ""371msgstr ""
304372
305#: ../libertine/qml/WelcomeView.qml:42373#: ../libertine/qml/PackageExistsDialog.qml:33
306msgid "Welcome to the Ubuntu Legacy Application Support Manager."374msgid "Search again"
307msgstr ""375msgstr ""
308376
309#: ../libertine/qml/WelcomeView.qml:50377#: ../libertine/qml/PackageExistsDialog.qml:43
310msgid ""378msgid "Return to search results"
311"You do not have Legacy Application Support configured at this time. "
312"Downloading and setting up the required environment takes some time and "
313"network bandwidth."
314msgstr ""
315
316#: ../libertine/qml/WelcomeView.qml:58
317msgid "Install"
318msgstr ""
319
320#: ../libertine/qml/ContainerInfoView.qml:28
321msgid "Container information for %1"
322msgstr ""
323
324#: ../libertine/qml/ContainerInfoView.qml:48
325msgid "ID"
326msgstr ""
327
328#: ../libertine/qml/ContainerInfoView.qml:55
329msgid "Name"
330msgstr ""
331
332#: ../libertine/qml/ContainerInfoView.qml:62
333msgid "Distribution"
334msgstr ""
335
336#: ../libertine/qml/ContainerInfoView.qml:69
337msgid "Status"
338msgstr ""
339
340#: ../libertine/qml/ContainerOptionsDialog.qml:27
341msgid "Container Options"
342msgstr ""
343
344#: ../libertine/qml/ContainerOptionsDialog.qml:28
345msgid "Configure options for container creation."
346msgstr ""
347
348#: ../libertine/qml/ContainerOptionsDialog.qml:50
349msgid "Enter or name for the container or leave blank for default name"
350msgstr ""
351
352#: ../libertine/qml/ContainerOptionsDialog.qml:56
353msgid "container name"
354msgstr ""379msgstr ""
355380
=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py 2016-04-18 15:20:57 +0000
+++ python/libertine/Libertine.py 2016-04-22 16:16:24 +0000
@@ -56,7 +56,9 @@
5656
5757
58def apt_command_prefix(verbosity):58def apt_command_prefix(verbosity):
59 return '/usr/bin/apt ' + apt_args_for_verbosity_level(verbosity) + ' --option Apt::Cmd::Disable-Script-Warning=true '59 return '/usr/bin/apt-get ' + apt_args_for_verbosity_level(verbosity) + \
60 ' --option Apt::Cmd::Disable-Script-Warning=true --option Dpkg::Progress-Fancy=1' + \
61 ' --option Apt::Color=1 '
6062
6163
62def handle_runtime_error(error):64def handle_runtime_error(error):
@@ -341,7 +343,7 @@
341 """343 """
342 try:344 try:
343 with ContainerRunning(self.container):345 with ContainerRunning(self.container):
344 if not self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") == 0:346 if self.container.run_in_container(apt_command_prefix(verbosity) + "purge '" + package_name + "'") != 0:
345 return False347 return False
346 return self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0348 return self.container.run_in_container(apt_command_prefix(verbosity) + "autoremove --purge") == 0
347 except RuntimeError as e:349 except RuntimeError as e:
@@ -368,7 +370,7 @@
368 ubuntu-app-launch370 ubuntu-app-launch
369 """371 """
370 if libertine.utils.container_exists(self.container.container_id):372 if libertine.utils.container_exists(self.container.container_id):
371 self.container.launch_application(app_exec_line) 373 self.container.launch_application(app_exec_line)
372 else:374 else:
373 raise RuntimeError("Container with id %s does not exist." % self.container.container_id)375 raise RuntimeError("Container with id %s does not exist." % self.container.container_id)
374376
375377
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager 2016-04-19 19:07:37 +0000
+++ tools/libertine-container-manager 2016-04-22 16:16:24 +0000
@@ -422,7 +422,7 @@
422 update_package_install_status(args.id, args.package, "removing")422 update_package_install_status(args.id, args.package, "removing")
423423
424 if not container.remove_package(args.package, args.verbosity):424 if not container.remove_package(args.package, args.verbosity):
425 update_package_install_status(args.id, package, "installed")425 update_package_install_status(args.id, args.package, "installed")
426 sys.exit(1)426 sys.exit(1)
427427
428 update_package_install_status(args.id, args.package, "removed")428 update_package_install_status(args.id, args.package, "removed")

Subscribers

People subscribed via source and target branches