diff options
author | Bernie Innocenti <bernie@codewiz.org> | 2010-04-10 11:18:39 (GMT) |
---|---|---|
committer | Bernie Innocenti <bernie@codewiz.org> | 2010-04-10 11:18:39 (GMT) |
commit | 04d010e5e3db043f26f65f99009060e394469859 (patch) | |
tree | aab3e36c8f8109a929852e6704376b3f8adb1cf6 | |
parent | 3b56346d71d40461831f71442de35fd54ff13f74 (diff) | |
parent | ca836400d24c9cd71f86a7470b337b7e73846b93 (diff) |
Merge branch 'master' of git.sugarlabs.org:sugar-jhbuild/mainline into mainline
-rwxr-xr-x | sugar-jhbuild | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sugar-jhbuild b/sugar-jhbuild index 3cdc1a9..41c6e3a 100755 --- a/sugar-jhbuild +++ b/sugar-jhbuild @@ -25,7 +25,9 @@ __builtin__.__dict__['SRCDIR'] = jhbuild_dir args = sys.argv[1:] if os.path.exists(jhbuild_dir): - if not args or 'build' in args or 'update' in args: + if (not args or 'build' in args or 'update' in args) and not \ + ('-n' in args or '--help' in args or '-h' in args or + '--no-network' in args): print 'Updating sugar-jhbuild...' retcode = subprocess.call(['git', 'pull']) |