[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/binary-factory-tooling] android: FDroid: Only do what we know it works
From:       Aleix Pol <null () kde ! org>
Date:       2018-05-31 23:20:56
Message-ID: E1fOWsK-0005VW-Oh () code ! kde ! org
[Download RAW message or body]

Git commit be84fa78527e3a7bd7282773a822a643134965fc by Aleix Pol.
Committed on 31/05/2018 at 23:19.
Pushed by apol into branch 'master'.

FDroid: Only do what we know it works

M  +6    -14   android/generaterepo.py

https://commits.kde.org/sysadmin/binary-factory-tooling/be84fa78527e3a7bd7282773a822a643134965fc


diff --git a/android/generaterepo.py b/android/generaterepo.py
index e2d29a1..d112d82 100644
--- a/android/generaterepo.py
+++ b/android/generaterepo.py
@@ -6,14 +6,8 @@ import multiprocessing
 import subprocess
 
 dest = "repo"
-try:
-    os.mkdir(dest)
-    isNewRepository = True
-except FileExistsError:
-    isNewRepository = False
-
-#fdroid = "docker run --rm -u $(id -u):$(id -g) -v $(pwd):/repo \
                registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest"
-fdroid = "fdroid"
+# if dest directory doesn't exist, run fdroid init
+# https://f-droid.org/en/docs/Setup_an_F-Droid_App_Repo/
 
 def process(job):
     name = job['name']
@@ -44,11 +38,9 @@ with open("current-jobs.json") as f:
     pool = multiprocessing.Pool(8)
     pool.map(process, jobs)
 
-if isNewRepository:
-    subprocess.check_call(fdroid + " init", shell=True, cwd=dest)
-    subprocess.check_call(fdroid + " update -c", shell=True, cwd=dest)
-
+#fdroid = "docker run --rm -u $(id -u):$(id -g) -v $(pwd):/repo \
registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest" +fdroid = "fdroid"
 subprocess.check_call(fdroid + " update", shell=True, cwd=dest)
+subprocess.check_call(fdroid + " server update -v", shell=True, cwd=dest)
+
 
-remote = "android@racnoss.kde.org:/srv/archives/files/android/"
-rsyncProcess = subprocess.check_call("rsync -v -a %s %s" % (dest, remote), \
shell=True)


[prev in list] [next in list] [prev in thread] [next in thread]