diff options
Diffstat (limited to 'sugar-jhbuild')
| -rwxr-xr-x | sugar-jhbuild | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sugar-jhbuild b/sugar-jhbuild index 5f964fa..5cd450c 100755 --- a/sugar-jhbuild +++ b/sugar-jhbuild @@ -5,19 +5,13 @@ import sys import subprocess base_dir = os.path.abspath(os.path.dirname(__file__)) -jhbuild_dir = os.path.join(base_dir, 'build-scripts', 'jhbuild') -sys.path.append(jhbuild_dir) +sys.path.append(os.path.join(base_dir, 'build-scripts', 'jhbuild')) # The update needs to be very early, before we load any module if len(sys.argv) == 1 or (len(sys.argv) > 1 and sys.argv[1] == 'build'): print 'Updating sugar-jhbuild...' - - try: - subprocess.check_call(['git', 'pull']) - if not os.path.exists(os.path.join(jhbuild_dir, '.git')): - subprocess.check_call(['git', 'submodule', 'init']) - subprocess.check_call(['git', 'submodule', 'update']) - except subprocess.CalledProcessError: + retcode = subprocess.call(['git', 'pull']) + if retcode: print 'sugar-jhbuild update failed.' import main |