From 04d010e5e3db043f26f65f99009060e394469859 Mon Sep 17 00:00:00 2001
From: Bernie Innocenti <bernie@codewiz.org>
Date: Sat, 10 Apr 2010 11:18:39 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar-jhbuild/mainline into mainline

---
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'])
--
cgit v0.9.1