Merge branch 'alwaysUseLatest-honor-branch' of git://github.com/tompr…

…ince/buildbot
buildbot · Jan 22, 2012 · 130c32b · 130c32b
2 parents c69b40c + c303d10
commit 130c32b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/lorentz b/lorentz
diff --git a/master/buildbot/status/mail.py b/master/buildbot/status/mail.py
@@ -356,7 +356,7 @@ def setServiceParent(self, parent):
     def startService(self):
         if self.buildSetSummary:
             self.buildSetSubscription = \
-            self.parent.subscribeToBuildsetCompletions(self.buildsetFinished)
+            self.master.subscribeToBuildsetCompletions(self.buildsetFinished)
 
         base.StatusReceiverMultiService.startService(self)
 

diff --git a/master/buildbot/steps/source/oldsource.py b/master/buildbot/steps/source/oldsource.py
@@ -258,31 +258,32 @@ def start(self):
         # Allow workdir to be WithProperties
         self.args['workdir'] = self.workdir
 
-        # what source stamp would this build like to use?
-        id = self.getRepository()
-        s = self.build.getSourceStamp(id)
-
-        # if branch is None, then use the Step's "default" branch
-        branch = s.branch or self.branch
-        # if revision is None, use the latest sources (-rHEAD)
-        revision = s.revision
-        if not revision and not self.alwaysUseLatest:
-            revision = self.computeSourceRevision(s.changes)
-            # the revision property is currently None, so set it to something
-            # more interesting
-            if revision is not None:
-                self.setProperty('revision', str(revision), "Source")
-
-        # if patch is None, then do not patch the tree after checkout
-
-        # 'patch' is None or a tuple of (patchlevel, diff, root)
-        # root is optional.
-        patch = s.patch
-        if patch:
-            self.addCompleteLog("patch", patch[1])
-
-        if self.alwaysUseLatest:
+        if not self.alwaysUseLatest:
+            # what source stamp would this build like to use?
+            id = self.getRepository()
+            s = self.build.getSourceStamp(id)
+
+            # if branch is None, then use the Step's "default" branch
+            branch = s.branch or self.branch
+            # if revision is None, use the latest sources (-rHEAD)
+            revision = s.revision
+            if not revision:
+                revision = self.computeSourceRevision(s.changes)
+                # the revision property is currently None, so set it to something
+                # more interesting
+                if revision is not None:
+                    self.setProperty('revision', str(revision), "Source")
+
+            # if patch is None, then do not patch the tree after checkout
+
+            # 'patch' is None or a tuple of (patchlevel, diff, root)
+            # root is optional.
+            patch = s.patch
+            if patch:
+                self.addCompleteLog("patch", patch[1])
+        else:
             revision = None
+            branch = self.branch
 
         self.args['logEnviron'] = self.logEnviron
         self.args['env'] = self.env