prepare release

crossrepomove: Fix dbscripts path for [community] move to nymeria
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2025-09-13 18:06:19 +02:00 · 2012-11-15 14:38:03 +01:00 · 2012-11-15 14:32:34 +01:00 · 2012-11-15 14:28:50 +01:00 · 2012-11-15 14:27:20 +01:00 · 2012-11-12 18:44:26 +01:00
8 changed files with 26 additions and 13 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-V=20121013
+V=20121115

 PREFIX = /usr/local

--- a/archco.in
+++ b/archco.in
@@ -13,7 +13,7 @@ case $scriptname in
 	archco)
 		SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
 	communityco)
-		SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";;
+		SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
 	*)
 		die "Couldn't find svn url for $scriptname"
 		;;
--- a/checkpkg.in
+++ b/checkpkg.in
@@ -58,7 +58,7 @@ for _pkgname in "${pkgname[@]}"; do
 		elif [[ -f "$STARTDIR/$oldpkg" ]]; then
 			ln -s "$STARTDIR/$oldpkg" "$oldpkg"
 		else
-			wget --quiet "$pkgurl"
+		        curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl"
 		fi
 	fi

--- a/commitpkg.in
+++ b/commitpkg.in
@@ -109,7 +109,7 @@ if [[ -z $server ]]; then
 		core|extra|testing|staging|kde-unstable|gnome-unstable)
 			server='gerolde.archlinux.org' ;;
 		community*|multilib*)
-			server='aur.archlinux.org' ;;
+			server='nymeria.archlinux.org' ;;
 		*)
 			server='gerolde.archlinux.org'
 			msg "Non-standard repository $repo in use, defaulting to server $server" ;;
--- a/crossrepomove.in
+++ b/crossrepomove.in
@@ -13,8 +13,8 @@ pkgbase="${1}"

 packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
 packages_server='gerolde.archlinux.org'
-community_svn='svn+ssh://aur.archlinux.org/srv/svn-packages'
-community_server='aur.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'

 case $scriptname in
@@ -72,11 +72,23 @@ svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${targe
 pushd "target_checkout/${pkgbase}/trunk" >/dev/null
 archrelease "${arch[@]/#/$target_repo-}" || die
 popd >/dev/null
-ssh "${target_server}" '/arch/db-update' || die
+
+if [[ "${target_server}" == "${community_server}" ]]; then
+        dbscripts_path='/srv/repos/svn-community/dbscripts'
+else
+        dbscripts_path='/arch'
+fi
+
+ssh "${target_server}" "${dbscripts_path}/db-update" || die

 msg "Removing ${pkgbase} from ${source_repo}"
+if [[ "${source_server}" == "${community_server}" ]]; then
+        dbscripts_path='/srv/repos/svn-community/dbscripts'
+else
+        dbscripts_path='/arch'
+fi
 for _arch in ${arch[@]}; do
-	ssh "${source_server}" "/arch/db-remove ${source_repo} ${_arch} ${pkgbase}"
+	ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}"
 done
 svn -q checkout -N "${source_svn}" source_checkout
 svn -q up "source_checkout/${pkgbase}"
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -78,7 +78,7 @@ trap_abort() {

 trap_exit() {
 	trap - EXIT INT QUIT TERM HUP
-	cleanup 0
+	cleanup
 }

 die() {
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -44,7 +44,7 @@ while getopts 'r:ufnhC:M:c:' arg; do
 		M) makepkg_conf="$OPTARG" ;;
 		n) NOCOPY='y' ;;
 		c) cache_dir="$OPTARG" ;;
-		h|?) usage 0 ;;
+		h|?) usage ;;
 		*) error "invalid argument '${arg}'"; usage ;;
 	esac
 done
@@ -160,7 +160,8 @@ copy_hostconf () {
 }

 trap_chroot_umount () {
-	trap 'trap_exit' EXIT INT QUIT TERM HUP
+	trap 'trap_abort' INT QUIT TERM HUP
+	trap 'trap_exit' EXIT

 	for cache_dir in ${cache_dirs[@]}; do
 		umount "${working_dir}/${cache_dir}"
Author	SHA1	Message	Date
Pierre Schmitz	2020fb406a	prepare release	2012-11-15 14:38:03 +01:00
Eric Bélanger	4427b80aba	crossrepomove: Fix dbscripts path for [community] move to nymeria Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2012-11-15 14:32:34 +01:00
Eric Bélanger	41b54bdde5	mkarchroot: Remove unnecessary parameter for usage function Fixes FS#28973 Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2012-11-15 14:28:50 +01:00
Eric Bélanger	54bad4c91d	checkpkg: replace wget usage by curl Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2012-11-15 14:27:20 +01:00
Pierre Schmitz	fc95a57556	prepare release	2012-11-12 18:44:26 +01:00
Pierre Schmitz	21458bd07b	For now only packages and svn from sigurd will be moved to nymeria	2012-11-11 21:07:34 +01:00
Pierre Schmitz	a05969b29d	prepare release	2012-11-03 18:26:45 +01:00
Pierre Schmitz	fdeaed894a	Use nymeria.archlinux.org as shared host for developers and trusted users	2012-11-03 17:32:33 +01:00
Pierre Schmitz	3699321904	Prepare release	2012-10-27 20:31:05 +02:00
Pierre Schmitz	d8ec9c9066	Use sigurd.archlinux.org instead of the now moved aur.archlinux.org hostname	2012-10-27 20:30:24 +02:00
Jan Alexander Steffens (heftig)	fbb2bd2b8e	Fix return code handling Stop trap_exit from forcing a 0 exit code. This fixes makechrootpkg, which used to always return success, even if the build failed. Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2012-10-27 20:27:39 +02:00