Merge lp:~cjwatson/click/chroot-session-improvements into lp:click/devel

[Colin Watson]

Allow "click chroot install" and "click chroot upgrade" to operate on sessions.

"click chroot install" and "click chroot upgrade" could easily operate on sessions; they use maint() under the hood which can already do this. This branch adds the option plumbing to make it work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/click-devel-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-i386-ci/99

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/99/rebuild

review: Approve (continuous-integration)

[Michael Vogt (mvo)]

LGTM

review: Approve

=== modified file 'click/commands/chroot.py'
--- click/commands/chroot.py	2014-09-25 14:26:39 +0000
+++ click/commands/chroot.py	2014-10-13 12:50:22 +0000
@@ -72,7 +72,9 @@
 
 def install(parser, args):
     packages = args.packages
-    chroot = ClickChroot(args.architecture, args.framework, name=args.name)
+    chroot = ClickChroot(
+        args.architecture, args.framework, name=args.name,
+        session=args.session)
     with message_on_error(
             ClickChrootDoesNotExistException, ErrorMessages.NOT_EXISTS):
         return chroot.install(*packages)
@@ -120,7 +122,9 @@
 
 
 def upgrade(parser, args):
-    chroot = ClickChroot(args.architecture, args.framework, name=args.name)
+    chroot = ClickChroot(
+        args.architecture, args.framework, name=args.name,
+        session=args.session)
     with message_on_error(
             ClickChrootDoesNotExistException, ErrorMessages.NOT_EXISTS):
         return chroot.upgrade()
@@ -194,11 +198,19 @@
     upgrade_parser = subparsers.add_parser(
         "upgrade",
         help="upgrade the chroot")
+    upgrade_parser.add_argument(
+        "-n", "--session-name",
+        dest='session',
+        help="persistent chroot session name to upgrade")
     upgrade_parser.set_defaults(func=upgrade)
     install_parser = subparsers.add_parser(
         "install",
         help="install packages in the chroot")
     install_parser.add_argument(
+        "-n", "--session-name",
+        dest='session',
+        help="persistent chroot session name to install packages in")
+    install_parser.add_argument(
         "packages", nargs="+",
         help="packages to install")
     install_parser.set_defaults(func=install)
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-10-13 12:34:43 +0000
+++ debian/changelog	2014-10-13 12:50:22 +0000
@@ -8,6 +8,8 @@
   * Make "click info" always try opening the input file as a package and
     only try to interpret it as a file in an installed package if that
     fails, rather than guessing by the input file extension.
+  * Allow "click chroot install" and "click chroot upgrade" to operate on
+    sessions.
 
   [ Pete Woods ]
   * Include Canonical's cmake-extras project in the schroot.
 
=== modified file 'doc/manpage.rst'
--- doc/manpage.rst	2014-09-10 11:50:18 +0000
+++ doc/manpage.rst	2014-10-13 12:50:22 +0000
@@ -124,7 +124,7 @@
 end-session SESSION
     End a persistent chroot session.
 
-install PACKAGES
+install [-n SESSION] PACKAGES
     Install packages in the chroot.
 
 maint [-n SESSION] COMMAND ARGUMENTS
@@ -143,7 +143,7 @@
     session must previously have been created by ``click chroot
     begin-session``.
 
-upgrade
+upgrade [-n SESSION]
     Upgrade the chroot.
 
 click contents PATH