Merge lp:~frankban/charms/oneiric/buildbot-slave/new-lpsetup into lp:~yellow/charms/oneiric/buildbot-slave/trunk

[Francesco Banconi]

Update lpsetup command line arguments.

== Changes ==

Fixed the arguments passed to lp-setup in lpbuildbot.yaml to reflect the lpsetup new UI.

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'examples/lpbuildbot.yaml'
--- examples/lpbuildbot.yaml	2012-05-22 14:47:07 +0000
+++ examples/lpbuildbot.yaml	2012-07-25 08:28:21 +0000
@@ -3,9 +3,9 @@
   script-retrieval-method: apt
   script-source: lpsetup
   script-path: "/usr/bin/lp-setup"
-  # The buildbot user's home directory is /var/lib/buildout.
-  # The LP dependencies will be in /var/lib/buildout/launchpad/dependencies.
-  script-args: "lxc-install -u buildbot -e [e-mail] -f 'Launchpad PQM' -c {installdir} -d /var/lib/buildbot/launchpad/dependencies -S launchpad_lxc_id_rsa --testing"
+  # The buildbot user's home directory is `/var/lib/buildout`.
+  # The LP dependencies will be in `/var/lib/buildout/slaves/slave/devel`.
+  script-args: "install-lxc -u buildbot -E [e-mail] -f 'Launchpad PQM' -r {installdir} -S launchpad_lxc_id_rsa --testing"
   extra-repository: deb http://us.archive.ubuntu.com/ubuntu/ lucid main universe
   buildbot-pkg: buildbot/lucid
   extra-packages: testrepository