Support for multiple servers has never been used by the official aurweb
setup and the current implementation makes it impossible to use server
URIs that contain spaces. For simplicity, change the implementation such
that only a single server is supported.
Signed-off-by: Lukas Fleischer
---
conf/config.proto | 2 +-
scripts/aurblup.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conf/config.proto b/conf/config.proto
index e545977..21441a9 100644
--- a/conf/config.proto
+++ b/conf/config.proto
@@ -62,7 +62,7 @@ max-blob-size = 256000
[aurblup]
db-path = /srv/http/aurweb/aurblup/
sync-dbs = core extra community multilib testing community-testing
-servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
+server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
[mkpkglists]
packagesfile = /srv/http/aurweb/web/html/packages.gz
diff --git a/scripts/aurblup.py b/scripts/aurblup.py
index 0009715..1b6de2f 100755
--- a/scripts/aurblup.py
+++ b/scripts/aurblup.py
@@ -8,7 +8,7 @@ import aurweb.db
db_path = aurweb.config.get('aurblup', 'db-path')
sync_dbs = aurweb.config.get('aurblup', 'sync-dbs').split(' ')
-servers = aurweb.config.get('aurblup', 'servers').split(' ')
+server = aurweb.config.get('aurblup', 'server')
def main():
@@ -19,7 +19,7 @@ def main():
h = pyalpm.Handle("/", db_path)
for sync_db in sync_dbs:
repo = h.register_syncdb(sync_db, pyalpm.SIG_DATABASE_OPTIONAL)
- repo.servers = [server.replace("%s", sync_db) for server in servers]
+ repo.servers = [server.replace("%s", sync_db)]
t = h.init_transaction()
repo.update(False)
t.release()
--
2.10.0