QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Propagate error code from rpmbuid

Browse Source 
Fixes qubesos/qubes-issues#1099
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-04 04:00:43 +02:00
parent 713726a5a9
commit 48c942c4a6
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_template_rpm
View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
NAME=$1 NAME=$1
set -e
if [ x$NAME = x ] ; then if [ x$NAME = x ] ; then
echo "usage $0 <template_name>" echo "usage $0 <template_name>"
exit 1 exit 1
@ -15,6 +17,7 @@ if [ -d qubeized_images/$NAME/untrusted_appmenus ]; then
for f in whitelisted-appmenus.list vm-whitelisted-appmenus.list netvm-whitelisted-appmenus.list; do for f in whitelisted-appmenus.list vm-whitelisted-appmenus.list netvm-whitelisted-appmenus.list; do
grep '^[a-zA-Z0-9.()_-]\+.desktop$' $srcdir/$f > appmenus/$f grep '^[a-zA-Z0-9.()_-]\+.desktop$' $srcdir/$f > appmenus/$f
done done
trap "rm -rf appmenus-$$ appmenus" EXIT
fi fi
rpmbuild --target noarch \ rpmbuild --target noarch \
@ -23,7 +26,3 @@ rpmbuild --target noarch \
--define "_topdir $PWD/rpmbuild" \ --define "_topdir $PWD/rpmbuild" \
--define "_tmppath $PWD/rpmbuild/tmp" \ --define "_tmppath $PWD/rpmbuild/tmp" \
-bb templates.spec -bb templates.spec
if [ -d appmenus-$$ ]; then
rm -rf appmenus-$$ appmenus
fi