Prepare release

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>

Makefile

@@ -1,4 +1,4 @@
-V=20121013
+V=20121027
 
 PREFIX = /usr/local
 

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"
 		;;

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" ;;

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_svn='svn+ssh://sigurd.archlinux.org/srv/svn-packages'
-community_server='aur.archlinux.org'
+community_server='sigurd.archlinux.org'
 mirror='http://mirrors.kernel.org/archlinux'
 
 case $scriptname in

lib/common.sh

@@ -78,7 +78,7 @@ trap_abort() {
 
 trap_exit() {
 	trap - EXIT INT QUIT TERM HUP
-	cleanup 0
+	cleanup
 }
 
 die() {

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

mkarchroot.in

@@ -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}"