From 70a82faa924bfc6f1462673aee11b1ff6093d82c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 21 Sep 2013 16:28:20 -0400 Subject: librerelease: support per-user staging directories The relies on db-update on the server respecting STAGING if it is set in the environment. https://labs.parabola.nu/issues/314 --- src/abslibre-tools/librerelease | 2 +- src/libretools.conf | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 64d5004..8bd5934 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -235,7 +235,7 @@ release_packages() { clean_files "$file_list" msg "Running db-update on repos" - ssh ${REPODEST%%:*} dbscripts/db-update + ssh ${REPODEST%%:*} "$(printf 'STAGING=%q dbscripts/db-update' "${REPODEST#*:}")" if [[ -n $HOOKPOSTRELEASE ]]; then msg "Running HOOKPOSTRELEASE..." diff --git a/src/libretools.conf b/src/libretools.conf index 593aed6..8690803 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -35,9 +35,8 @@ ABSLIBREGIT=ssh://git@projects.parabolagnulinux.org:1863/srv/git/abslibre.git ################################################################################ ## Where to upload packages to -# Don't change unless you know what you're doing and you won't screw -# anything ;) -REPODEST=repo@repo:/srv/http/repo/public +# '/staging/' is appended; this is for compatability with previous versions. +REPODEST=repo@repo:/srv/http/repo/staging-$LIBREUSER ## Assumes something similar in your .ssh/config: # Host repo # Port 1863 -- cgit v1.2.2