Revert sourcestamp move in 919f116

Moving a styles.Versioned class makes the versioning fail, so don't do that. Thanks to aivarsk for finding this so quickly. Fixes #1844.
buildbot · Mar 2, 2011 · cf7dd42 · cf7dd42
1 parent 0a70c1e
commit cf7dd42
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 213 deletions.
diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
@@ -21,7 +21,7 @@
 from twisted.python import log
 from twisted.python.procutils import which
 
-from buildbot.process.sourcestamp import SourceStamp
+from buildbot.sourcestamp import SourceStamp
 from buildbot.util import now
 from buildbot.status import builder
 

diff --git a/master/buildbot/db/connector.py b/master/buildbot/db/connector.py
@@ -20,7 +20,7 @@
 
 from buildbot import util
 from buildbot.util import collections as bbcollections
-from buildbot.process.sourcestamp import SourceStamp
+from buildbot.sourcestamp import SourceStamp
 from buildbot.process.buildrequest import BuildRequest
 from buildbot.process.properties import Properties
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE

diff --git a/master/buildbot/process/debug.py b/master/buildbot/process/debug.py
@@ -25,7 +25,7 @@ def detached(self, mind):
         pass
 
     def perspective_requestBuild(self, buildername, reason, branch, revision, properties={}):
-        from buildbot.process.sourcestamp import SourceStamp
+        from buildbot.sourcestamp import SourceStamp
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
         ss = SourceStamp(branch, revision)

diff --git a/master/buildbot/process/sourcestamp.py b/master/buildbot/process/sourcestamp.py