use stored metadatapath instead of guessing it

[fdroidserver.git] / fdroidserver / build.py

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index cc73679d0c3ec9d2900b567c9650036f9e59a4cd..21e4fce2734b8cf964cd525f73e01fafdc5e99ab 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -136,8 +136,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
         ftp.mkdir('metadata')
         ftp.mkdir('srclibs')
         ftp.chdir('metadata')
-        metadatapath = common.metadata_relpath(app.id)
-        ftp.put(metadatapath, os.path.basename(metadatapath))
+        ftp.put(app.metadatapath, os.path.basename(app.metadatapath))
+
         # And patches if there are any...
         if os.path.exists(os.path.join('metadata', app.id)):
             send_dir(os.path.join('metadata', app.id))
@@ -185,8 +185,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
             send_dir(lib)
             # Copy the metadata file too...
             ftp.chdir(homedir + '/srclibs')
-            srclibpath = common.metadata_srclib_relpath(name)
-            ftp.put(srclibpath, os.path.basename(srclibpath))
+            ftp.put(os.path.join('srclibs', name + '.txt'),
+                    name + '.txt')
         # Copy the main app source code
         # (no need if it's a srclib)
         if (not basesrclib) and os.path.exists(build_dir):