lp:~townsend/libertine/merge-config-files

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:libertine at revision 210

Larry Price: Approve on 2016-04-22

Libertine CI Bot: Approve (continuous-integration) on 2016-04-22

Diff: 137 lines (+64/-9)

2 files modified

data/puritine-click.conf (+8/-3)
tools/libertine-container-manager (+56/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1566391: Allow user created containers to co-exist with Puritine containers

Medium

Fix Released

Link a bug report

Related blueprints

210. By Christopher Townsend on 2016-04-22

Add back in the metavar options we care about.
Require the --file option for merge-configs.
Hide the exec subcommand as well.

209. By Christopher Townsend on 2016-04-22

Add a 'merge-configs' command to l-c-m which allows merging a specified ContainersConfig.json file with the existing config file.
Also fix up the puritine-click upstart job to handle co-existing configs.

208. By Christopher Townsend on 2016-04-20

Revert the xmir dependency from rev. 205 as this is causing a few headaches. And ubuntu-app-launch will depend on xmir instead.

Approved by Libertine CI Bot, Larry Price.

207. By Christopher Townsend on 2016-04-20

Use shutil.which() instead of hardcoded path for detecting if proot is on the system. Fixes alternate $PATH locations such as in a snap. Fixes: https://bugs.launchpad.net/bugs/1572591.

Approved by Larry Price, Libertine CI Bot.

206. By Christopher Townsend on 2016-04-19

Catch runtime errors raised when starting a container so a crash file is not generated and to tell the GUI that there was an error so the user can be presented a proper notification. Fixes: https://bugs.launchpad.net/bugs/1539105.

Approved by Larry Price, Libertine CI Bot.

205. By Christopher Townsend on 2016-04-19

Have libertine-tools depend on xmir to pull it in for folks you install libertine. This is a temporary measure and another package (maybe ubuntu-app-launch) should depend on xmir. Fixes: https://bugs.launchpad.net/bugs/1570395.

Approved by Larry Price, Libertine CI Bot.

204. By Christopher Townsend on 2016-04-18

Check to see if libertine-container-manager is ran using sudo and if so, print a message and exit. Fixes: https://bugs.launchpad.net/bugs/1570548.

Approved by Larry Price, Libertine CI Bot.

203. By Christopher Townsend on 2016-04-14

Check to make sure a subcommand was given and if not, print out the usage. Fixes: https://bugs.launchpad.net/bugs/1539104.

Approved by Libertine CI Bot, Stephen M. Webb.

202. By Christopher Townsend on 2016-04-13

More Libertine GUI improvements:
* Use a popup for package install/remove failures. Popup will be shown no matter what page is being shown.
* Rename the "Configure" container page to "Manage" container page.
* Move updating the container from the action select popover to the Manage container page.
* Add a container info selection to the action select popover.
* Add a new "updating" state for the container state.
* Use the actual container name in page headers instead of the container ID.
* Make activity indicators right justified in the lists to be consistent with other apps.
* Add a message when lists are empty.

Approved by Stephen M. Webb, Libertine CI Bot.

201. By Christopher Townsend on 2016-04-13

Merge debian/changelog from lp:libertine/trunk after last release.