From e41a4477f2ff7c72e48e4cfcfd7b0843c427dc31 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Thu, 20 Dec 2018 14:07:10 +0100
Subject: [PATCH] Update for moving blender2.8 to master, master to blender2.7.

---
 master.cfg       | 12 ++++++------
 master_unpack.py |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/master.cfg b/master.cfg
index e310143..ac75d48 100644
--- a/master.cfg
+++ b/master.cfg
@@ -4,10 +4,10 @@
 # <pep8 compliant>
 
 # List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
+NIGHT_SCHEDULE_BRANCHES = [None, "blender2.7"]
 
 # List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"]
+FORCE_SCHEDULE_BRANCHES = ["master", "blender2.7", "experimental-build"]
 
 """
 Stock Twisted directory lister doesn't provide any information about last file
@@ -130,7 +130,7 @@ def schedule_force_build(name):
             forcesched.CodebaseParameter(
                 codebase="blender-addons",
                 branch=forcesched.ChoiceStringParameter(
-                    name="branch", choices=["master", "blender2.8"], default="master"),
+                    name="branch", choices=["master", "blender2.7"], default="master"),
                 repository=forcesched.FixedParameter(name="repository", default="", hide=True),
                 project=forcesched.FixedParameter(name="project", default="", hide=True),
                 revision=forcesched.FixedParameter(name="revision", default="", hide=True),
@@ -146,10 +146,10 @@ def schedule_build(name, hour, minute=0):
         scheduler_name = "nightly " + name
         if current_branch:
             scheduler_name += ' ' + current_branch
-        # Use special addons submodule branch when building blender2.8 branch.
+        # Use special addons submodule branch when building blender2.7 branch.
         addons_branch = "master"
-        if current_branch == "blender2.8":
-            addons_branch = "blender2.8"
+        if current_branch == "blender2.7":
+            addons_branch = "blender2.7"
         c['schedulers'].append(timed.Nightly(name=scheduler_name,
             codebases={
                 "blender": {"repository": ""},
diff --git a/master_unpack.py b/master_unpack.py
index 67b628f..61c6309 100644
--- a/master_unpack.py
+++ b/master_unpack.py
@@ -67,8 +67,8 @@ def get_platform(filename):
 
 
 def get_branch(filename):
-    if filename.startswith("blender-2.8"):
-        return "blender2.8"
+    if filename.startswith("blender-2.7"):
+        return "blender2.7"
 
     tokens = filename.split("-")
     branch = ""