Merge lp:~jelmer/bzr/setup.py-root into lp:bzr

[Jelmer Vernooij]

Run setup.py with --root rather than with --prefix.

This branch changes the setup.py test to use --root rather than --prefix. --root changes the root for all file paths (including /usr/share/apport/ and /etc). This changes fixes the setup.py test inside of the Debian packages.

Presumably it also prevents bzr selftest from writing to /etc and /usr/share/ when run as root.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11/4/2010 5:46 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/setup.py-root into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core): code
>
>
> This branch changes the setup.py test to use --root rather than --prefix. --root changes the root for all file paths (including /usr/share/apport/ and /etc). This changes fixes the setup.py test inside of the Debian packages.
>
> Presumably it also prevents bzr selftest from writing to /etc and /usr/share/ when run as root.

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkzSuggACgkQJdeBCYSNAAOsLwCdGArbHhdN5AJ8kIIQqQV3xC+h
5osAn3mRh7oCa18vo7hLECbFoIhPAwZz
=DTLO
-----END PGP SIGNATURE-----

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'bzrlib/tests/test_setup.py'
--- bzrlib/tests/test_setup.py	2010-09-25 20:08:01 +0000
+++ bzrlib/tests/test_setup.py	2010-11-04 10:46:06 +0000
@@ -55,7 +55,7 @@
             raise TestSkipped('You must have distutils installed to run this test.'
                               ' Usually this can be found by installing "python-dev"')
         self.log('test_build running in %s' % os.getcwd())
-        install_dir = osutils.mkdtemp()
+        root_dir = osutils.mkdtemp()
         # setup.py must be run from the root source directory, but the tests
         # are not necessarily invoked from there
         self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))
@@ -63,10 +63,10 @@
             self.run_setup(['clean'])
             # build is implied by install
             ## self.run_setup(['build'])
-            self.run_setup(['install', '--prefix', install_dir])
+            self.run_setup(['install', '--root', root_dir])
             self.run_setup(['clean'])
         finally:
-            osutils.rmtree(install_dir)
+            osutils.rmtree(root_dir)
 
     def run_setup(self, args):
         args = [sys.executable, './setup.py', ] + args