Merge branch 'master' of gitorious.org:f-droid/fdroidserver

diff --cc fdroidserver/common.py
index a00bfe673521ead8d8ac787162e88386b8b7deec,36fcead55043a41075b05642d7abb6ec716cbf21..dfde98d325dcdc554892860bfa5b0bcdb5c43f5e
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1344,17 -1344,12 +1344,19 @@@ def getsrclib(spec, srclib_dir, basepat
          
          if srclib["Update Project"] == "Yes":
              print "Updating srclib %s at path %s" % (name, libdir)
 -            if subprocess.call([os.path.join(config['sdk_path'], 'tools', 'android'),
 -                'update', 'project', '-p', libdir]) != 0:
 -                    raise BuildException( 'Error updating ' + name + ' project')
 +            p = FDroidPopen([
 +                os.path.join(config['sdk_path'], 'tools', 'android'),
 +                'update', 'project', '-p', libdir])
 +            # Check to see whether an error was returned without a proper exit
 +            # code (this is the case for the 'no target set or target invalid'
 +            # error)
 +            if p.returncode != 0 or (p.stderr != "" and
 +                    p.stderr.startswith("Error: ")):
 +                raise BuildException("Failed to update srclib project {0}"
 +                        .format(name), p.stdout, p.stderr)
  
+             remove_signing_keys(libdir)
+ 
      if basepath:
          return sdir
      return libdir