Merge lp:~therve/gf.recipe.bzr/destionation-option into lp:~ree/gf.recipe.bzr/trunk

[Sidnei da Silva]

[Sidnei da Silva (sidnei)]

Add support for a custom destination directory, so that you can keep your bzr branches in a central location outside buildout if you so wish.

[Balazs Ree (ree)]

review: Approve

=== modified file 'gf/recipe/bzr/bzr.py'
--- gf/recipe/bzr/bzr.py	2009-06-22 17:24:00 +0000
+++ gf/recipe/bzr/bzr.py	2009-06-23 15:27:33 +0000
@@ -62,6 +62,7 @@
         in_parts = False
         http_authentication = username:password
         develop = True
+        destination = /src/code
 
     For more information, consult the file docs/README.txt in the egg.
     """
@@ -96,7 +97,17 @@
         root_dir = buildout['buildout']['directory']
         if in_parts.capitalize() == 'True':
             root_dir =  os.path.join(root_dir, 'parts')
-        options['root_dir'] = root_dir = os.path.join(root_dir, name)
+        
+        options["destination"] = destination = options.get("destination", "")
+        if destination:
+            if in_parts.capitalize() == 'True':
+                self.logger.error(
+                    "Can't specify both in_parts and destination")
+                raise zc.buildout.UserError("Destination and in_parts specified.")
+            options["root_dir"] = root_dir = destination
+        else:
+            options['root_dir'] = root_dir = os.path.join(root_dir, name)
+
         # Process the branches.
         branches = []
         for line in options['urls'].splitlines():