summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2016-09-21 21:50:17 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2016-09-29 22:07:24 +0200
commitcc66259d339ec805265503662bf5da61f63512cc (patch)
treec7c04503a241af68dc02c79ee3c48b3ef1537d92
parentd00f4c5197652563a61628461a39fd799264c9c4 (diff)
downloadaur-cc66259d339ec805265503662bf5da61f63512cc.tar.gz
aur-cc66259d339ec805265503662bf5da61f63512cc.tar.xz
aurblup: Drop support for multiple servers
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 <lfleischer@archlinux.org>
-rw-r--r--conf/config.proto2
-rwxr-xr-xscripts/aurblup.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/config.proto b/conf/config.proto
index e545977e..21441a9f 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 0009715f..1b6de2f0 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()