Bug#740868: autopkgtest: Fix for adt-virt-schroot to correctly set root-on-testbed when invoked as root

[Steve Langasek]

Package: autopkgtest
Version: 2.10
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

The adt-virt-schroot manpage says:

       adt-virt-schroot  reads  the  schroot  configuration (root-users/root-
       groups)  to determine whether it can enter the schroot as root user; if
       so, it sets the root-on-testbed capability and you can run tests which
       require  building or running as root. If your user is not allowed to do
       that, you need to run adt-run as root instead.

However, running adt-run as root still does not set the root-on-testbed
capability, which means that trying to run a test that requires this
capability still fails if I run e.g., 'sudo adt-run'.

The attached patch makes adt-virt-schroot consistent with the manpage.
Possible changelog entry:

  [ Steve Langasek ]
  * Fix adt-virt-schroot to correctly return root-on-testbed when we're
    running adt-run as root.

Thanks for considering the patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: autopkgtest_2.10.debdiff
Type: text/x-diff
Size: 599 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/autopkgtest-devel/attachments/20140305/a5deca20/attachment.diff>