Rev 5522: (jameinel) Run setup.py with --root rather than with --prefix. (Jelmer in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5522 [merge]
revision-id: pqm at pqm.ubuntu.com-20101104172234-6yoirc0trqsgcj8m
parent: pqm at pqm.ubuntu.com-20101102235146-sw9vxf9n28nc1cuj
parent: jelmer at samba.org-20101102114915-di5bfbphhp3w04ql
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-11-04 17:22:34 +0000
message:
  (jameinel) Run setup.py with --root rather than with --prefix. (Jelmer
   Vernooij)
modified:
  bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
=== modified file 'bzrlib/tests/test_setup.py'
--- a/bzrlib/tests/test_setup.py	2010-09-25 20:08:01 +0000
+++ b/bzrlib/tests/test_setup.py	2010-11-02 11:49:15 +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