From d5523e20b799995a2d9df14910ed96ce53ea2bcf Mon Sep 17 00:00:00 2001 From: Will Holland Date: Thu, 10 Sep 2015 14:24:37 +0100 Subject: Fix assuming it is on the correct branch --- builder_logic.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'builder_logic.py') diff --git a/builder_logic.py b/builder_logic.py index 8f3b56c..c5fc188 100644 --- a/builder_logic.py +++ b/builder_logic.py @@ -4,6 +4,7 @@ ORCHE_URL = 'http://127.0.0.1:8080/' BUILD_SCRIPT = 'bild_a_system.sh' DEPLOY_SCRIPT = 'deploy_a_system.sh' DEFINITIONS_DIR='/home/patrickdarley/definitions' +REF = "cu010-trove/br6/firehose-test-1" whitelist = [ 'clusters/tlsa.morph', @@ -19,7 +20,11 @@ def files_changed(): import os owd = os.getcwd() os.chdir(DEFINITIONS_DIR) - cmd = ['git', 'diff', '--name-only', 'HEAD~1', 'HEAD'] + SHAcmd = ['git', 'log', REF, '--format=format:%H', '-2'] + SHAproc = subprocess.Popen(cmd, stdout=subprocess.PIPE) + SHAout, SHAerr = p.communicate() + SHA = SHAout.split() + cmd = ['git', 'diff', '--name-only', SHA[0], SHA[1]] p = subprocess.Popen(cmd, stdout=subprocess.PIPE) out, err = p.communicate() os.chdir(owd) -- cgit v1.2.1