[SCM] Debian packaging for sketch 3D line drawing software branch, master, updated. debian/0.2.183-1-7-g909ff9a
David Bremner
bremner at unb.ca
Sat Dec 18 03:18:54 UTC 2010
The following commit has been merged in the master branch:
commit c7c5668f0f006fbb047d1763398be62e4a164842
Author: David Bremner <bremner at unb.ca>
Date: Fri Dec 17 23:14:53 2010 -0400
factor out patch generation loop, to make error handling more obvious
diff --git a/debian/export-patches.sh b/debian/export-patches.sh
index 531a484..31930aa 100644
--- a/debian/export-patches.sh
+++ b/debian/export-patches.sh
@@ -32,20 +32,28 @@ cleanup (){
rm -rf $tmpdir
exit 1
}
+
+do_patches (){
+ while read -r base tip
+ do
+ case $base in
+ \#*)
+ ;;
+ *)
+ count=$(wc -l $tmpdir/series | cut -f1 -d' ')
+ if PATCHES=$(git format-patch --start-number $count -N -o $tmpdir $base...$tip); then
+ echo $PATCHES | sed -e "s%$tmpdir/%%g" -e 's% %\n%g'>> $tmpdir/series
+ else
+ echo "git format-patch failed"
+ cleanup
+ fi
+ esac
+ done
+}
+
echo "# Patches exported from git by gitpkg-export-patches" > $tmpdir/series
-sed -e s/%DEB_VERSION%/${DEB_VERSION}/g -e s/%DEB_UPSTREAM%/${DEB_UPSTREAM}/ < $recipe |
-while read -r base tip
-do
- case $base in
- \#*)
- ;;
- *)
- count=$(wc -l $tmpdir/series | cut -f1 -d' ')
- PATCHES=$(git format-patch --start-number $count -N -o $tmpdir $base...$tip)
- echo $PATCHES | sed -e "s%$tmpdir/%%g" -e 's% %\n%g'>> $tmpdir/series
- esac
-done
+sed -e s/%DEB_VERSION%/${DEB_VERSION}/g -e s/%DEB_UPSTREAM%/${DEB_UPSTREAM}/ < $recipe | do_patches || exit 1
count=$(wc -l $tmpdir/series | cut -f1 -d' ')
--
Debian packaging for sketch 3D line drawing software
More information about the debian-science-commits
mailing list