Prepare release

Use sigurd.archlinux.org instead of the now moved aur.archlinux.org hostname
Fix return code handling
2025-09-13 09:56:18 +02:00 · 2012-10-27 20:31:05 +02:00 · 2012-10-27 20:30:24 +02:00 · 2012-10-27 20:27:39 +02:00 · 2012-10-13 21:06:31 +02:00 · 2012-10-13 20:40:09 +02:00
9 changed files with 14 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *~
-devtools-*.tar.gz
+devtools-*.tar.gz*
 archbuild
 archco
 archrelease
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-V=20121004
+V=20121027

 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://sigurd.archlinux.org/srv/svn-packages";;
 	*)
 		die "Couldn't find svn url for $scriptname"
 		;;
--- a/archrelease.in
+++ b/archrelease.in
@@ -66,7 +66,7 @@ for tag in "$@"; do
 		while read -r file; do
 			trash+=("repos/$tag/$file")
 		done < <(svn ls "repos/$tag")
-		[[ $trash ]] && svn rm -q "${trash[@]}"
+		[[ $trash ]] && svn rm -q "${trash[@]/%/@}"
 	else
 		mkdir -p "repos/$tag"
 		svn add --parents -q "repos/$tag"
--- 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='sigurd.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://sigurd.archlinux.org/srv/svn-packages'
+community_server='sigurd.archlinux.org'
 mirror='http://mirrors.kernel.org/archlinux'

 case $scriptname in
--- 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/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -213,12 +213,12 @@ if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
 	echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
 fi

-if [[ -n $MAKEFLAGS ]]; then 
+if [[ -n $MAKEFLAGS ]]; then
 	sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
 	echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
 fi

-if [[ -n $PACKAGER ]]; then 
+if [[ -n $PACKAGER ]]; then
 	sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
 	echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
 fi
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -131,7 +131,7 @@ chroot_mount() {
 		[[ -e "${working_dir}/run" ]] || mkdir "${working_dir}/run"
 		mount -t tmpfs tmpfs "${working_dir}/run" -o mode=0755,nodev,nosuid,strictatime,size=64M

-		for host_config in resolv.conf timezone localtime; do
+		for host_config in resolv.conf localtime; do
 			bind_mount /etc/$host_config ro
 		done
 	fi
@@ -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}"
@@ -168,7 +169,7 @@ trap_chroot_umount () {
 	[[ -n $host_mirror_path ]] && umount "${working_dir}/${host_mirror_path}"

 	if (( ! have_nspawn )); then
-		for host_config in resolv.conf timezone localtime; do
+		for host_config in resolv.conf localtime; do
 			umount "${working_dir}/etc/${host_config}"
 		done
 		umount "${working_dir}/proc/sys"
Author	SHA1	Message	Date
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
Pierre Schmitz	d5c6bc7656	prepare release	2012-10-13 21:06:31 +02:00
Dan McGee	f7615fe7d7	Fix releasing files with '@' in name SVN treats '@' as a revision specifier, so with the addition of systemd spawning service files, we need to ensure it doesn't screw things up. Signed-off-by: Dan McGee <dan@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2012-10-13 20:40:09 +02:00
Pierre Schmitz	1703b92e1a	mkarchroot: do not try to bind /etc/timezone from host /etc/timezone is no longer used. We only need /etc/localtime. This fixes FS#31929	2012-10-13 20:33:53 +02:00