Merge branch 'testing' into html

1 files changed, 5 insertions, 4 deletions

diff --git a/fabfile/common.py b/fabfile/common.py
index 217da2c..3658666 100644
--- a/fabfile/common.py
+++ b/fabfile/common.py
@@ -78,10 +78,11 @@ def get_instance_name():
     global _instance_name
 
     if _instance_name is None:
+        _instance_name == "production"
+
         branch = local("git rev-parse --abbrev-ref HEAD", capture=True)
-        if branch == "master":
-            _instance_name = "production"
-        else:
-            _instance_name = "testing"
+        for name, info in instances.items():  
+            if info["branch"] == branch:
+                _instance_name = name
 
     return _instance_name