Rev 58: Fix BzrGetSource, really. in file:///home/vila/buildbot/bzr/

Vincent Ladeuil v.ladeuil+lp at free.fr
Mon Aug 17 14:03:57 BST 2009


At file:///home/vila/buildbot/bzr/

------------------------------------------------------------
revno: 58
revision-id: v.ladeuil+lp at free.fr-20090817130357-gvud9ehf43j6fdsv
parent: v.ladeuil+lp at free.fr-20090817095312-roryvb233gms8og8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr
timestamp: Mon 2009-08-17 15:03:57 +0200
message:
  Fix BzrGetSource, really.
  
  * master/master.cfg:
  (BzrGetSource): steps are serialized/deserialized across the wire
  so their constructors *can't* be simplified, they *must* accept
  the right params.
-------------- next part --------------
=== modified file 'master/master.cfg'
--- a/master/master.cfg	2009-08-17 09:53:12 +0000
+++ b/master/master.cfg	2009-08-17 13:03:57 +0000
@@ -98,14 +98,22 @@
     )
 
 
-class BzrSource(source.Bzr):
+class BzrGetSource(source.Bzr):
 
-    def __init__(self):
+    def __init__(self,
+                 repourl=None,
+                 baseURL='http://bazaar.launchpad.net/~bzr/bzr/',
+                 defaultBranch='trunk',
+# requires 0.7.11 or 12                 forceSharedRepo=True,
+                 # Keep room for initial checkout when needed
+                 timeout=3600,
+                 **kwargs):
         source.Bzr.__init__(self,
-                            baseURL=bzr_base_URL,
-                            defaultBranch='trunk',
-                            # Keep room for initial checkout when needed
-                            timeout=3600,
+                            repourl=repourl, baseURL=baseURL,
+                            defaultBranch=defaultBranch,
+#                            forceSharedRepo=forceSharedRepo,
+                            timeout=timeout,
+                            **kwargs
                             )
 
 
@@ -144,11 +152,9 @@
                ]
 
 
-bzr_base_URL = "http://bazaar.launchpad.net/~bzr/bzr/"
-
 tests_factory = factory.BuildFactory()
 
-tests_factory.addStep(BzrSource())
+tests_factory.addStep(BzrGetSource())
 tests_factory.addStep(BzrBuildExtensions())
 # We don't specify LANG here, each slave has its own default value
 tests_factory.addStep(BzrSelftest())
@@ -188,7 +194,7 @@
         combi = '%s-%s' % (bzr_target, plugin_target)
         name = 'installer-%s' % (combi,)
         steps = [
-            BzrSource(),
+            BzrGetSource(),
             shell.Compile(
                 command=["make", "installer-all",
                          r"BZR_TARGET=%s" % bzr_target,



More information about the bazaar-commits mailing list