From d0ff0151a05870a70e540915c4ab0e468dea3377 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Fri, 24 Jan 2014 10:42:37 -0800 Subject: [PATCH] Fixed: adding python changes to master. --- test/script/regression.py | 1 + test/script/srcupdater.py | 7 +++++++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 test/script/regression.py mode change 100644 => 100755 test/script/srcupdater.py diff --git a/test/script/regression.py b/test/script/regression.py old mode 100644 new mode 100755 index 14777be679..0d09f72a22 --- a/test/script/regression.py +++ b/test/script/regression.py @@ -719,6 +719,7 @@ class TestConfiguration(object): self.email_enabled = True print("Email will be sent to ", self.mail_to) else: + self.email_enabled = False print("No email will be sent.") diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py old mode 100644 new mode 100755 index a86417d6e9..c444be2346 --- a/test/script/srcupdater.py +++ b/test/script/srcupdater.py @@ -74,6 +74,13 @@ def gitPull(TskOrAutopsy, branch): gppth = make_local_path("..", "GitPullOutput" + TskOrAutopsy + ".txt") attachl.append(gppth) gpout = open(gppth, 'a') + if TskOrAutopsy == "sleuthkit": + ccwd = os.path.join("..", "..", "..", "sleuthkit") + else: + ccwd = os.path.join("..", "..") + print("Checking out " + branch) + call = ["git", "checkout", branch] + subprocess.call(call, stdout=sys.stdout, cwd=ccwd) toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy call = ["git", "pull", toPull, branch] if TskOrAutopsy == "sleuthkit":