From 363d404cbf1ecc87b66994f17f1242f0ff7a16b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 16 Nov 2013 22:49:37 +0100
Subject: [PATCH] Fix remaining srclib issues

---
 fdroidserver/build.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 96446bb7..0879b255 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -294,7 +294,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         basesrclib = vcs.getsrclib()
         if basesrclib:
             srclibpaths.append(basesrclib)
-        for name, lib in srclibpaths:
+        for name, number, lib in srclibpaths:
             if options.verbose:
                 print "Sending srclib '" + lib + "'"
             ftp.chdir('/home/vagrant/build/srclib')
@@ -453,7 +453,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
     if 'build' in thisbuild:
         cmd = common.replace_config_vars(thisbuild['build'])
         # Substitute source library paths into commands...
-        for name, libpath in srclibpaths:
+        for name, number, libpath in srclibpaths:
             libpath = os.path.relpath(libpath, root_dir)
             cmd = cmd.replace('$$' + name + '$$', libpath)
         if options.verbose: