summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-11-11 21:07:34 +0100
committerPierre Schmitz <pierre@archlinux.de>2012-11-11 21:07:34 +0100
commit21458bd07b06e35b9b4ad6495440b9a0c4bbd345 (patch)
treefbc8563894685f8a7c69823e6453307f449d37df
parenta05969b29d31e3fc8e7186f6e53dfe1b839b6f5f (diff)
For now only packages and svn from sigurd will be moved to nymeria
-rw-r--r--Makefile2
-rw-r--r--archco.in2
-rw-r--r--commitpkg.in10
-rw-r--r--crossrepomove.in4
-rw-r--r--rebuildpkgs.in2
5 files changed, 14 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 5cd51b9..88479d5 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,6 @@ dist:
gpg --detach-sign --use-agent devtools-$(V).tar.gz
upload:
- scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/
+ scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/
.PHONY: all clean install uninstall dist upload
diff --git a/archco.in b/archco.in
index 1ee977e..5d497cc 100644
--- a/archco.in
+++ b/archco.in
@@ -11,7 +11,7 @@ fi
case $scriptname in
archco)
- SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
+ SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
communityco)
SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
*)
diff --git a/commitpkg.in b/commitpkg.in
index 4d13cf8..e31838c 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -105,7 +105,15 @@ for _arch in ${arch[@]}; do
done
if [[ -z $server ]]; then
- server='nymeria.archlinux.org'
+ case "$repo" in
+ core|extra|testing|staging|kde-unstable|gnome-unstable)
+ server='gerolde.archlinux.org' ;;
+ community*|multilib*)
+ server='nymeria.archlinux.org' ;;
+ *)
+ server='gerolde.archlinux.org'
+ msg "Non-standard repository $repo in use, defaulting to server $server" ;;
+ esac
fi
if [[ -n $(svn status -q) ]]; then
diff --git a/crossrepomove.in b/crossrepomove.in
index fa649b1..a19e5f3 100644
--- a/crossrepomove.in
+++ b/crossrepomove.in
@@ -11,8 +11,8 @@ fi
pkgbase="${1}"
-packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
-packages_server='nymeria.archlinux.org'
+packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
+packages_server='gerolde.archlinux.org'
community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
community_server='nymeria.archlinux.org'
mirror='http://mirrors.kernel.org/archlinux'
diff --git a/rebuildpkgs.in b/rebuildpkgs.in
index 49c7ac7..f7b1612 100644
--- a/rebuildpkgs.in
+++ b/rebuildpkgs.in
@@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
chrootdir="$1"; shift
pkgs="$@"
-SVNPATH='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
+SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
msg "Work will be done in $(pwd)/rebuilds"