Reintroduce deprecated workdir property.

It is unfortunatley named, but dropping it now doesn't provide a clear migration path. Supporting both for at least a version allows smoother migration.
buildbot · Jun 5, 2013 · eb8526c · eb8526c
1 parent 1d8e005
commit eb8526c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/master/buildbot/process/build.py b/master/buildbot/process/build.py
@@ -197,11 +197,11 @@ def setupSlaveBuilder(self, slavebuilder):
         buildslave_properties = slavebuilder.slave.properties
         self.getProperties().updateFromProperties(buildslave_properties)
         if slavebuilder.slave.slave_basedir:
-            self.setProperty("builddir",
-                    self.path_module.join(
-                        slavebuilder.slave.slave_basedir,
-                        self.builder.config.slavebuilddir),
-                    "Slave")
+            builddir = self.path_module.join(
+                            slavebuilder.slave.slave_basedir,
+                            self.builder.config.slavebuilddir),
+            self.setProperty("builddir", builddir, "slave")
+            self.setProperty("workdir", builddir, "slave (deprecated)")
 
         self.slavename = slavebuilder.slave.slavename
         self.build_status.setSlavename(self.slavename)

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -85,6 +85,7 @@ Deprecations, Removals, and Non-Compatible Changes
 
 * The ``workdir`` build property has been renamed to ``builddir``.
   This change accurately reflects its content; the term "workdir" means something different.
+  ``workdir`` is currently still supported for backwards compatability, but will be removed eventually.
 
 * The ``Blocker`` step has been removed.