From 8d9ffaeb572dd144cbf986dcb327d703f8effd58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 23 Mar 2017 16:59:08 +0100
Subject: [PATCH] Update envsetup at tester init (refs #20902).
---
tester.py | 2 ++
update_envsetup.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tester.py b/tester.py
index 44709792..8c4ac97c 100755
--- a/tester.py
+++ b/tester.py
@@ -78,6 +78,8 @@ class Tester():
if whoami != 'root' and not debug:
log('This script should be run as root user.')
sys.exit(1)
+ # Update envsetup files
+ subprocess.call(['python3', 'update_envsetup.py'])
# Load conf
conf = utils.load_conf()
if not conf:
diff --git a/update_envsetup.py b/update_envsetup.py
index 3795f13e..5532477a 100755
--- a/update_envsetup.py
+++ b/update_envsetup.py
@@ -9,7 +9,7 @@ if __name__ == '__main__':
os.chdir(os.path.dirname(os.path.abspath(os.path.expanduser(__file__))))
sys.stdout.write('Updating envsetup: ')
sys.stdout.flush()
- subprocess.check_call('git pull', shell=True)
subprocess.call('find . -name *.pyc -type f -delete', shell=True)
subprocess.call('find . -name __pycache__ -type d -delete', shell=True)
+ subprocess.call('git pull', shell=True)
subprocess.call('find . -type d -empty -delete', shell=True)
--
GitLab