Merge lp:~abentley/bzr-builder/launchpad into lp:bzr-builder

[Aaron Bentley]

update to lp:bzr-builder tip

This updates to bzr-builder tip so that we can use its improved error messages.

[Māris Fogels (mars)]

Hi Aaron, this looks good. r=mars

You may want to self-review merges like this in future - I am not sure I contributed much :)

review: Approve

Unmerged revisions

68. By Aaron Bentley on 2010-11-23

update to lp:bzr-builder tip

67. By Launchpad PQM Bot on 2010-10-26

[rs=rockstar] update to lp:bzr-builder tip

66. By Launchpad PQM Bot on 2010-09-02

[r=rockstar] Update to lp:bzr-builder tip.

65. By Launchpad PQM Bot on 2010-07-23

[r=abentley] Merge from trunk

64. By Launchpad PQM Bot on 2010-04-19

[rs=rockstar]Update to trunk tip

63. By Launchpad PQM Bot on 2010-01-13

[rs=me] update to bzr-builder trunk

62. By Launchpad PQM Bot on 2010-01-10

[rs=me] remove the recursive symlink

=== modified file '__init__.py'
--- __init__.py	2010-08-16 19:56:09 +0000
+++ __init__.py	2010-11-23 17:09:53 +0000
@@ -142,14 +142,6 @@
   0.3 - added "nest-part" instruction.
 """
 
-if __name__ == '__main__':
-    import os
-    import subprocess
-    import sys
-    dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plugins")
-    retcode = subprocess.call("bzr selftest -s bzrlib.plugins.builder",
-            shell=True, env={"BZR_PLUGIN_PATH": dir})
-    sys.exit(retcode)
 
 
 from bzrlib.commands import plugin_cmds

=== removed directory 'plugins'
=== removed symlink 'plugins/builder'
=== target was u'..'