From: Michael Pöhn <michael.poehn@fsfe.org>
Date: Thu, 8 Jun 2017 10:52:11 +0000 (+0200)
Subject: refactored publishing source tarball into a function
X-Git-Tag: 0.9~65^2~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=45688bfe42b14b27b7e018a9e24740547541c7a6;p=fdroidserver.git

refactored publishing source tarball into a function
---

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index bafa29f6..5fc2ff58 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -37,6 +37,18 @@ config = None
 options = None
 
 
+def publish_source_tarball(apkfilename, unsigned_dir, output_dir):
+    """Move the source tarball into the output directory..."""
+
+    tarfilename = apkfilename[:-4] + '_src.tar.gz'
+    tarfile = os.path.join(unsigned_dir, tarfilename)
+    if os.path.exists(tarfile):
+        shutil.move(tarfile, os.path.join(output_dir, tarfilename))
+        logging.debug('...published %s', tarfilename)
+    else:
+        logging.debug('...no source tarball for %s', apkfilename)
+
+
 def main():
 
     global config, options
@@ -138,18 +150,23 @@ def main():
             if compare_result:
                 logging.error("...verification failed - publish skipped : "
                               + compare_result)
-                continue
+            else:
 
-            # Success! So move the downloaded file to the repo, and remove
-            # our built version.
-            shutil.move(srcapk, os.path.join(output_dir, apkfilename))
-            os.remove(apkfile)
+                # Success! So move the downloaded file to the repo, and remove
+                # our built version.
+                shutil.move(srcapk, os.path.join(output_dir, apkfilename))
+                os.remove(apkfile)
+
+                publish_source_tarball(apkfilename, unsigned_dir, output_dir)
+                logging.info('Published ' + apkfilename)
 
         elif apkfile.endswith('.zip'):
 
             # OTA ZIPs built by fdroid do not need to be signed by jarsigner,
             # just to be moved into place in the repo
             shutil.move(apkfile, os.path.join(output_dir, apkfilename))
+            publish_source_tarball(apkfilename, unsigned_dir, output_dir)
+            logging.info('Published ' + apkfilename)
 
         else:
 
@@ -219,13 +236,8 @@ def main():
                 raise BuildException(_("Failed to align application"))
             os.remove(apkfile)
 
-        # Move the source tarball into the output directory...
-        tarfilename = apkfilename[:-4] + '_src.tar.gz'
-        tarfile = os.path.join(unsigned_dir, tarfilename)
-        if os.path.exists(tarfile):
-            shutil.move(tarfile, os.path.join(output_dir, tarfilename))
-
-        logging.info('Published ' + apkfilename)
+            publish_source_tarball(apkfilename, unsigned_dir, output_dir)
+            logging.info('Published ' + apkfilename)
 
 
 if __name__ == "__main__":