From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 15 Nov 2013 09:47:32 +0000 (+0000)
Subject: Merge branch 'master' of gitorious.org:f-droid/fdroidserver
X-Git-Tag: 0.1~186
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=887e7541703ef01eae0455a83c14cf4c4eb48022;p=fdroidserver.git

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

887e7541703ef01eae0455a83c14cf4c4eb48022
diff --cc fdroidserver/common.py
index a00bfe67,36fcead5..dfde98d3
--- a/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