Merge branch 'master' into logging

Conflicts:
	fdroidserver/build.py

diff --cc fdroidserver/build.py
index 96daeeb69ef1611fc95d31cdb37893d0436af1af,c60069d5d811adebf44fefb34fa3cd35ebdf1d4e..bdf54ed2db63c4aa96d296539e7114f4cfa01d5e
--- 1/fdroidserver/build.py
--- 2/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -428,14 -444,15 +429,15 @@@ def build_local(app, thisbuild, vcs, bu
              raise BuildException("Can't build due to " +
                  str(len(buildprobs)) + " scanned problems")
  
-     # Build the source tarball right before we build the release...
-     logging.info("Creating source tarball...")
-     tarname = common.getsrcname(app,thisbuild)
-     tarball = tarfile.open(os.path.join(tmp_dir, tarname), "w:gz")
-     def tarexc(f):
-         return any(f.endswith(s) for s in ['.svn', '.git', '.hg', '.bzr'])
-     tarball.add(build_dir, tarname, exclude=tarexc)
-     tarball.close()
+     if not options.notarball:
+         # Build the source tarball right before we build the release...
 -        print "Creating source tarball..."
++        logging.info("Creating source tarball...")
+         tarname = common.getsrcname(app,thisbuild)
+         tarball = tarfile.open(os.path.join(tmp_dir, tarname), "w:gz")
+         def tarexc(f):
+             return any(f.endswith(s) for s in ['.svn', '.git', '.hg', '.bzr'])
+         tarball.add(build_dir, tarname, exclude=tarexc)
+         tarball.close()
  
      # Run a build command if one is required...
      if 'build' in thisbuild:
@@@ -588,8 -607,8 +590,8 @@@
  
          p = FDroidPopen(commands, cwd=gradle_dir)
  
-     else:
+     elif thisbuild['type'] == 'ant':
 -        print "Building Ant project..."
 +        logging.info("Building Ant project...")
          cmd = ['ant']
          if 'antcommand' in thisbuild:
              cmd += [thisbuild['antcommand']]
@@@ -599,9 -618,9 +601,9 @@@
  
          bindir = os.path.join(root_dir, 'bin')
  
-     if p.returncode != 0:
+     if p is not None and p.returncode != 0:
          raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
 -    print "Successfully built version " + thisbuild['version'] + ' of ' + app['id']
 +    logging.info("Successfully built version " + thisbuild['version'] + ' of ' + app['id'])
  
      if thisbuild['type'] == 'maven':
          stdout_apk = '\n'.join([

diff --cc fdroidserver/common.py
Simple merge

diff --cc fdroidserver/metadata.py
Simple merge