fdroidserver 2.3.1__tar.gz → 2.3.2__tar.gz

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/CHANGELOG.md

@@ -12,6 +12,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Removed
 
+## [2.3.2] - 2024-11-26
+
+### Fixed
+
+* install: fix downloading from GitHub Releases and Maven Central.
+* Sync translations for: ca fa fr pt ru sr ta zh_Hant
+
 ## [2.3.1] - 2024-11-25
 
 ### Fixed

{fdroidserver-2.3.1/fdroidserver.egg-info → fdroidserver-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3.1
+Version: 2.3.2
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/buildserver/provision-apt-get-install

@@ -114,6 +114,7 @@ packages="
  gnupg
  mercurial
  patch
+ python3-magic
  python3-packaging
  rsync
  sdkmanager/bookworm-backports

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/fdroidserver/common.py

@@ -2976,7 +2976,7 @@ def FDroidPopenBytes(commands, cwd=None, envs=None, output=True, stderr_to_stdou
     while not stdout_reader.eof():
         while not stdout_queue.empty():
             line = stdout_queue.get()
-            if output and options.verbose:
+            if output and options and options.verbose:
                 # Output directly to console
                 sys.stderr.buffer.write(line)
                 sys.stderr.flush()

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/fdroidserver/install.py

@@ -80,7 +80,6 @@ def download_apk(appid='org.fdroid.fdroid', privacy_mode=False):
             # prefer APK in default release channel
             preferred_version = version
             break
-        print('skipping', version)
 
     mirrors = common.append_filename_to_mirrors(
         preferred_version['file']['name'][1:], common.FDROIDORG_MIRRORS
@@ -116,7 +115,8 @@ def download_fdroid_apk_from_github(privacy_mode=False):
         token = None
     gh = github.GithubApi(token, 'https://github.com/f-droid/fdroidclient')
     latest_apk = gh.get_latest_apk()
-    return net.download_file(latest_apk)
+    filename = os.path.basename(latest_apk)
+    return net.download_file(latest_apk, os.path.join(common.get_cachedir(), filename))
 
 
 def download_fdroid_apk_from_ipns(privacy_mode=False):
@@ -137,10 +137,11 @@ def download_fdroid_apk_from_maven(privacy_mode=False):
         mirrors = MAVEN_CENTRAL_MIRRORS[:2]  # skip the Google servers
     else:
         mirrors = MAVEN_CENTRAL_MIRRORS
-    mirrors = common.append_filename_to_mirrors(
-        os.path.join(path, 'maven-metadata.xml'), mirrors
+    metadata = net.download_using_mirrors(
+        common.append_filename_to_mirrors(
+            os.path.join(path, 'maven-metadata.xml'), mirrors
+        )
     )
-    metadata = net.download_using_mirrors(mirrors)
     version = XMLElementTree.parse(metadata).getroot().findall('*.//latest')[0].text
     mirrors = common.append_filename_to_mirrors(
         os.path.join(path, version, f'F-Droid-{version}.apk'), mirrors

{fdroidserver-2.3.1 → fdroidserver-2.3.2/fdroidserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3.1
+Version: 2.3.2
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/locale/ca/LC_MESSAGES/fdroidserver.po

@@ -5,20 +5,21 @@
 # raulmagdalena <4omoald1a@mozmail.com>, 2024.
 # Adrià Martín <adriamartinmor@gmail.com>, 2024.
 # unmes <jordi.guiu.pujols@gmail.com>, 2024.
+# Joan Pujolar <joan.pujolar@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-11-21 21:34+0100\n"
-"PO-Revision-Date: 2024-09-30 03:51+0000\n"
-"Last-Translator: pitroig <ona@riseup.net>\n"
+"PO-Revision-Date: 2024-11-26 15:16+0000\n"
+"Last-Translator: Joan Pujolar <joan.pujolar@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/f-droid/fdroidserver/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-dev\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -205,7 +206,7 @@ msgstr "'{value}' no és un {field} vàlid; hauria de ser {pattern}"
 
 #: ../fdroidserver/checkupdates.py
 msgid "--merge-request only runs on a single appid!"
-msgstr ""
+msgstr "--merge-request només funciona amb un sol ID d'app!"
 
 #: ../fdroidserver/checkupdates.py
 #, python-brace-format
@@ -336,11 +337,11 @@ msgstr "AutoUpdateMode amb UpdateCheckMode: HTTP ha de tenir un patró."
 
 #: ../fdroidserver/install.py
 msgid "Automatic no to all prompts."
-msgstr ""
+msgstr "No automàtic a totes les demandes."
 
 #: ../fdroidserver/install.py
 msgid "Automatic yes to all prompts."
-msgstr ""
+msgstr "Sí automàtic a totes les demandes."
 
 #: ../fdroidserver/index.py
 #, python-brace-format
@@ -436,7 +437,7 @@ msgstr "Actualització neta - no utilitza la memòria cau, reprocessa tots els A
 
 #: ../fdroidserver/common.py
 msgid "Color the log output"
-msgstr ""
+msgstr "Color de l'egressió del registre"
 
 #: ../fdroidserver/import_subcommand.py
 msgid "Comma separated list of categories."
@@ -453,7 +454,7 @@ msgstr "Publicar els canvis"
 
 #: ../fdroidserver/checkupdates.py
 msgid "Commit changes, push, then make a merge request"
-msgstr ""
+msgstr "Sancioneu els canvis, pitgeu i després feu la, sol·licitud de fusió"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -640,7 +641,7 @@ msgstr "No usis les sumes de verificació \"rsync\""
 
 #: ../fdroidserver/install.py
 msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
+msgstr "Descarregar F-Droid.apk amb els miralls que presenten menys filtracions a la xarxa"
 
 #: ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
@@ -752,7 +753,7 @@ msgstr "Extreu les signatures dels APKs"
 
 #: ../fdroidserver/install.py
 msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
+msgstr "F-Droid.apk no s'ha pogut descarregar de cap font coneguda!"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -1214,7 +1215,7 @@ msgstr "No s'ha trobat cap dispositiu adjunt"
 
 #: ../fdroidserver/install.py
 msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
+msgstr "No s'han trobat dispositius per a `adb install`! Sisplau, connecteu-ne algun."
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."
@@ -1422,7 +1423,7 @@ msgstr "Imprimeix la variable secreta al terminal per a copiar/enganxar fàcilme
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr ""
+msgstr "El mode privat s'ha habilitat en base al vostre ({country_code})."
 
 #: ../fdroidserver/scanner.py
 #, python-format
@@ -1547,7 +1548,7 @@ msgstr "Restringeix la sortida a avisos i errors"
 #: ../fdroidserver/net.py
 #, python-format
 msgid "Retrying failed download: %s"
-msgstr ""
+msgstr "Reintent fallit de descàrrega de: %s"
 
 #: ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
@@ -1616,7 +1617,7 @@ msgstr[1] "L'escàner ha trobat {} problemes"
 
 #: ../fdroidserver/scanner.py
 msgid "Scanning APK for extra signing blocks."
-msgstr ""
+msgstr "Pentinant L'APK en busca de blocs signants addicionals."
 
 #: ../fdroidserver/scanner.py
 msgid "Scanning APK with dexdump for known non-free classes."
@@ -2075,7 +2076,7 @@ msgstr "Verificació de la signatura de l'índex:"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "Verifying package {path} with apksigner."
-msgstr ""
+msgstr "Verificant la {path} del paquet amb el signador d'apk apksigner."
 
 #: ../fdroidserver/deploy.py
 #, python-brace-format
@@ -2088,7 +2089,7 @@ msgstr "Avisa de possibles errors a les metadades"
 
 #: ../fdroidserver/scanner.py
 msgid "WebAssembly binary file"
-msgstr ""
+msgstr "Document binari d'AssemblatgeWeb"
 
 #: ../fdroidserver/update.py
 msgid "When configured for signed indexes, create only unsigned indexes at this stage"
@@ -2104,11 +2105,11 @@ msgstr "Quan signar o verificar falla, sortiu amb un codi d'error."
 
 #: ../fdroidserver/install.py
 msgid "Would you like to download and install F-Droid.apk via adb? (YES/no)"
-msgstr ""
+msgstr "Us va bé de descarregar i instal·lar F-Droid.apk via adb? (SÍ/no)"
 
 #: ../fdroidserver/install.py
 msgid "Would you like to download the app(s) from f-droid.org? (YES/no)"
-msgstr ""
+msgstr "Us va bé de descarregar la/es app/s des de f-droid.org? (SÍ/no)"
 
 #: ../fdroidserver/init.py
 msgid "X.509 'Distinguished Name' used when generating keys"
@@ -2125,7 +2126,7 @@ msgstr "arxiu de fitxers ZIP"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "adb reports {serial} is \"{status}\"!"
-msgstr ""
+msgstr "adb informa que {serial} està en \"{status}\"!"
 
 #: ../fdroidserver/nightly.py
 #, python-brace-format
@@ -2693,7 +2694,7 @@ msgstr "els arguments següents són obligatoris: %s"
 
 #: ../fdroidserver/install.py
 msgid "true"
-msgstr ""
+msgstr "ver"
 
 #: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
 #: /usr/lib/python3.7/argparse.py /usr/lib/python3.9/argparse.py
@@ -2738,7 +2739,7 @@ msgstr "virustotal.com és limitant de velocitat, esperant tornar-ho a provar...
 
 #: ../fdroidserver/install.py
 msgid "yes"
-msgstr ""
+msgstr "sí"
 
 #: ../fdroidserver/publish.py
 #, python-brace-format
@@ -2856,7 +2857,7 @@ msgstr "{path} ha estat marcat pel virustotal {count} vegades:"
 #: ../fdroidserver/install.py
 #, python-brace-format
 msgid "{path} has the wrong fingerprint ({fingerprint})!"
-msgstr ""
+msgstr "{path} no té la ditada correcta ({fingerprint})!"
 
 #: ../fdroidserver/common.py
 #, python-brace-format

{fdroidserver-2.3.1 → fdroidserver-2.3.2}/locale/fr/LC_MESSAGES/fdroidserver.po

@@ -31,7 +31,7 @@
 # translator <kvb@tuta.io>, 2022.
 # Julien Maulny <julien.maulny@protonmail.com>, 2022.
 # Translator <kvb@tuta.io>, 2022, 2023.
-# Ldm Public <ldmpub@gmail.com>, 2022, 2023.
+# Ldm Public <ldmpub@gmail.com>, 2022, 2023, 2024.
 # TopFox <Arnaud.Savary@etu.unige.ch>, 2022.
 # John Donne <akheron@zaclys.net>, 2022, 2023.
 # Deleted User <noreply+22825@weblate.org>, 2023.
@@ -44,8 +44,8 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-11-21 21:34+0100\n"
-"PO-Revision-Date: 2024-11-24 18:41+0000\n"
-"Last-Translator: Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>\n"
+"PO-Revision-Date: 2024-11-26 15:16+0000\n"
+"Last-Translator: Ldm Public <ldmpub@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -674,7 +674,7 @@ msgstr "Ne pas utiliser les sommes de contrôle rsync"
 
 #: ../fdroidserver/install.py
 msgid "Download F-Droid.apk using mirrors that leak less to the network"
-msgstr ""
+msgstr "Téléchager F-Droid.apk en utilisant des miroirs avec moins de fuites réseaux"
 
 #: ../fdroidserver/__main__.py
 msgid "Download complete mirrors of small repos"
@@ -738,12 +738,12 @@ msgstr "ERREUR : hébergeur git « %s » non supporté, les corrections sont
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "ERROR: {key} in {path} is not \"archive\" or \"repo\"!"
-msgstr ""
+msgstr "ERREUR : {key} dans {path} n'est pas \"archive\" ou \"repo\"."
 
 #: ../fdroidserver/lint.py
 #, python-brace-format
 msgid "ERROR: {key}:{subkey} in {path} is not in allowed keys: {allowed_keys}!"
-msgstr ""
+msgstr "ERREUR : {key} :{subkey} dans {path} n'est pas une clé valide parmi : {allowed_keys}."
 
 #: ../fdroidserver/__main__.py
 #, python-brace-format
@@ -766,7 +766,7 @@ msgstr "La variable d'environnent {var} de {configname} n'est pas configurée !"
 
 #: ../fdroidserver/deploy.py
 msgid "Error deploying 'github_releases', {} not present. (You might need to run `fdroid update` first.)"
-msgstr ""
+msgstr "Erreur lors du déploiement 'github_releases' : {} est absent (vous devriez peut-être d'abord lancer `fdroid update`)."
 
 #: ../fdroidserver/import_subcommand.py
 msgid "Error while getting repo address"
@@ -786,7 +786,7 @@ msgstr "Extraction des signatures à partir des APKs"
 
 #: ../fdroidserver/install.py
 msgid "F-Droid.apk could not be downloaded from any known source!"
-msgstr ""
+msgstr "F-Droid.apk ne peut pas être téléchargé depuis les source connues !"
 
 #: ../fdroidserver/update.py
 #, python-brace-format
@@ -905,7 +905,7 @@ msgstr "Plusieurs fichiers de bloc de signature JAR trouvé à {path}"
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Found multiple Signer Certificates!"
-msgstr "Plusieurs certificats de signature ont étés trouvés!"
+msgstr "Plusieurs signataires de certificats ont été trouvés !"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -1250,7 +1250,7 @@ msgstr "Aucun périphérique connecté trouvé"
 
 #: ../fdroidserver/install.py
 msgid "No devices found for `adb install`! Please plug one in."
-msgstr ""
+msgstr "Aucun appareil trouvé pour `adb install` ! Veuillez en branchez un."
 
 #: ../fdroidserver/index.py
 msgid "No fingerprint in URL."