From 0549535bab2dd4f9a9eaa127cab21970a8c1db0a Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sun, 30 Oct 2022 08:23:48 +0100
Subject: [PATCH] signindex: fix buster workaround

Don't try to remove arg if the old args where used.
---
 fdroidserver/signindex.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index d46c737e..852ed958 100644
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -110,8 +110,8 @@ def sign_jar(jar, use_old_algs=False):
         'FDROID_KEY_PASS': config.get('keypass', ""),
     }
     p = common.FDroidPopen(args, envs=env_vars)
-    if p.returncode != 0:
-        # workaround for buster-backports apksigner on f-droid.org publish server
+    if not use_old_algs and p.returncode != 0:
+        # workaround for apksigner v30 on f-droid.org publish server
         v4 = args.index("--v4-signing-enabled")
         del args[v4 + 1]
         del args[v4]