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

Merge branch 'verbose-rewrite' of gitorious.org:f-droid/fdroidserver into verbose-rewrite

Conflicts:
	fdroidserver/common.py
---

ff3faefd8084f57e98bce0154fc264a96a48d38c
diff --cc fdroidserver/common.py
index 3923054a,ea7593ed..07f0fbeb
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1355,9 -1344,7 +1355,7 @@@ 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()