makechrootpkg: Keep source files even if build fails

implementes FS#18437

archrelease

@@ -1,34 +1,34 @@
 #!/bin/bash
 
-if [ "$1" = '' ]; then
+abort() {
-	echo 'Usage: archrelease <repo>'
+	echo ${1:-'archrelease: Cancelled'}
 	exit 1
+}
+
+if [ "$1" = '' ]; then
+	abort 'Usage: archrelease <repo>'
 fi
 
 if [ ! -f PKGBUILD ]; then
-	echo 'archrelease: PKGBUILD not found'
+	abort 'archrelease: PKGBUILD not found'
-	exit 1
 fi
 
 if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
-	echo 'archrelease: Not in a package trunk dir'
+	abort 'archrelease: Not in a package trunk dir'
-	exit 1
 fi
 
-if [ "$(svn diff)" != '' ]; then
+if [ ! -z "$(svn status -q)" ]; then
-	echo 'archrelease: You have not committed your changes yet!'
+	abort 'archrelease: You have not committed your changes yet!'
-	echo '             Please run "svn commit" first'
-	exit 1
 fi
 
 echo -n 'releasing package...'
 pushd .. >/dev/null
-if [ -d repos/$1 ]; then
+if [ -d "repos/${1}" ]; then
-	svn rm --force -q repos/$1
+	svn rm --force -q "repos/${1}"
-	svn commit -q -m "archrelease: remove $1"
+	svn commit -q -m "archrelease: remove ${1}" || abort
 fi
-svn copy -q -r HEAD trunk repos/$1
+svn copy -q -r HEAD trunk "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to $1"
+svn commit -q -m "archrelease: copy trunk to ${1}" || abort
 popd >/dev/null
 echo 'done'
 

commitpkg

@@ -5,6 +5,17 @@ abort() {
 	exit 1
 }
 
+getpkgfile() {
+	if [[ ${#} -ne 1 ]]; then
+		echo 'ERROR: No canonical package found!' >&2
+		exit 1
+	elif [ ! -f "${1}" ]; then
+		echo "ERROR: Package ${1} not found!" >&2
+		exit 1
+	fi
+
+	echo ${1}
+}
 
 # Source makepkg.conf; fail if it is not found
 if [ -r '/etc/makepkg.conf' ]; then
@@ -74,17 +85,18 @@ echo 'done'
 
 for _arch in ${arch[@]}; do
 	for _pkgname in ${pkgname[@]}; do
-		pkgfile=$_pkgname-$pkgver-$pkgrel-${_arch}$PKGEXT
+		pkgfile=$(getpkgfile "$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
+		pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
 
-		if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
+		if [ ! -f "$pkgfile" -a -f "$pkgdestfile" ]; then
-			pkgfile="$PKGDEST/$pkgfile"
+			pkgfile="$pkgdestfile"
-		elif [ ! -f $pkgfile ]; then
+		elif [ ! -f "$pkgfile" ]; then
 			echo "skipping ${_arch}"
 			continue 2
 		fi
 
 		echo -n 'uploading '
-		rsync -c -h --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
+		rsync -c -h -L --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
 	done
 	archrelease $repo-${_arch} || abort
 done

lddd

@@ -19,12 +19,12 @@ for tree in $PATH $libdirs $extras; do
 	echo DIR $tree
 
 	#  Get list of files in tree.
-	files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' !
+	files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
-	-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name
+	-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
-	'*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm'
+	'*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
-	! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo'
+	! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
-	! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name
+	! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! \
-	'*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
+	-name '*.mcopclass' ! -name '*.mcoptype')
 	IFS=$ifs
 	for i in $files; do
 		if [ `file $i | grep -c 'ELF'` -ne 0 ]; then

makechrootpkg

@@ -196,14 +196,14 @@ cd /build
 export HOME=/build
 sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
 [ -f BUILD_FAILED ] && exit 1
-which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*${PKGEXT} > /pkgdest/namcap.log
+which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /pkgdest/namcap.log
 exit 0
 EOF
 ) > "$copydir/chrootbuild"
 chmod +x "$copydir/chrootbuild"
 
 if mkarchroot -r "/chrootbuild" "$copydir"; then
-	for pkgfile in "${copydir}"/pkgdest/*${PKGEXT}; do
+	for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
 		[ -e "$pkgfile" ] || continue
 		_pkgname=$(basename "$pkgfile")
 		if [ "$add_to_db" -eq "1" ]; then
@@ -221,15 +221,6 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 		fi
 	done
 
-	for f in "${copydir}"/srcdest/*; do
-		[ -e "$f" ] || continue
-		if [ -d "$SRCDEST" ]; then
-			mv "$f" "${SRCDEST}"
-		else
-			mv "$f" "${WORKDIR}"
-		fi
-	done
-
 	for l in "${copydir}"/build/*-{build,package}.log; do
 		[ -f "$l" ] && mv "$l" "${WORKDIR}"
 	done
@@ -238,6 +229,15 @@ else
 	touch "${copydir}/build/BUILD_FAILED"
 fi
 
+for f in "${copydir}"/srcdest/*; do
+	[ -e "$f" ] || continue
+	if [ -d "$SRCDEST" ]; then
+		mv "$f" "${SRCDEST}"
+	else
+		mv "$f" "${WORKDIR}"
+	fi
+done
+
 if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 	echo "Build failed, check $copydir/build"
 	rm "${copydir}/build/BUILD_FAILED"

mkarchroot

@@ -26,7 +26,7 @@ usage() {
 	echo '    -C <file>     Location of a pacman config file'
 	echo '    -M <file>     Location of a makepkg config file'
 	echo '    -n            Do not copy config files into the chroot'
-	echo "    -c <dir>      Set pacman cache. Default: ${cache_dir}"
+	echo "    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg"
 	echo '    -h            This message'
 	exit $1
 }