From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 1 Nov 2013 12:55:42 +0000 (+0100)
Subject: Merge branch 'master' into verbose-rewrite
X-Git-Tag: 0.1~244
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d525d987e20c7ebccfe309f3815fa38d8282d9f5;p=fdroidserver.git

Merge branch 'master' into verbose-rewrite
---

d525d987e20c7ebccfe309f3815fa38d8282d9f5
diff --cc fdroidserver/common.py
index a41fa0a4,ee5a3513..3923054a
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1344,11 -1342,8 +1355,11 @@@ def prepare_source(vcs, app, build, bui
          raise BuildException('Missing subdir ' + root_dir)
  
      # Initialise submodules if requred...
-     if build.get('submodules', 'no')  == 'yes':
+     if build.get('submodules', 'no') == 'yes':
          if verbose: print "Initialising submodules..."
 +    if build.get('submodules', 'no') == 'yes':
 +        if options.verbose:
 +            print "Initialising submodules..."
          vcs.initsubmodules()
  
      # Run an init command if one is required...