Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make tools/update_popcon exit with errors when it fails

This commit is contained in:
Steve McIntyre 2017-10-10 15:15:14 +01:00
parent f101d76440
commit c7991ae7b2
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -26,6 +26,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
Closes: #809698. Also use --ca-directory /etc/ssl/ca-debian/ with wget Closes: #809698. Also use --ca-directory /etc/ssl/ca-debian/ with wget
to ensure this works. to ensure this works.
+ Fix size calculation for EFI image + Fix size calculation for EFI image
+ Make tools/update_popcon exit with errors when it fails
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100

12
tools/update_popcon
View File

@ -63,7 +63,15 @@ dl_file () {
} }
MAIN_DATE=`dl_file main` MAIN_DATE=`dl_file main`
error=$?
if [ $error -ne 0 ]; then
exit $error
fi
CONTRIB_DATE=`dl_file contrib` CONTRIB_DATE=`dl_file contrib`
error=$?
if [ $error -ne 0 ]; then
exit $error
fi
OUT=$1 OUT=$1
rm -f $OUT rm -f $OUT
@ -81,3 +89,7 @@ echo "" >> $OUT
cat $TDIR/main $TDIR/contrib | \ cat $TDIR/main $TDIR/contrib | \
egrep -v '(^#|Total|-----|kernel-source)' | \ egrep -v '(^#|Total|-----|kernel-source)' | \
sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $2}' >> $OUT sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $2}' >> $OUT
if [ $? -ne 0 ]; then
exit $?
fi