[Pkg-haskell-commits] darcs: tools: Make pkg-haskell-checkout handle .tar.bz2 tarballs as well
Joachim Breitner
mail at joachim-breitner.de
Sat Jan 15 06:41:03 UTC 2011
Sat Jan 15 06:40:51 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Make pkg-haskell-checkout handle .tar.bz2 tarballs as well
Ignore-this: 71bd55587dd15ac74c48b0f31f7e8e12
M ./pkg-haskell-checkout -3 +4
Sat Jan 15 06:40:51 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Make pkg-haskell-checkout handle .tar.bz2 tarballs as well
Ignore-this: 71bd55587dd15ac74c48b0f31f7e8e12
diff -rN -u old-tools/pkg-haskell-checkout new-tools/pkg-haskell-checkout
--- old-tools/pkg-haskell-checkout 2011-01-15 06:41:03.050697295 +0000
+++ new-tools/pkg-haskell-checkout 2011-01-15 06:41:03.058697716 +0000
@@ -63,11 +63,12 @@
if echo $UPSTREAM | fgrep -q : ; then
UPSTREAM=`echo $UPSTREAM | cut -d: -f2-`
fi
- TARBALL=${PACKAGE}_$UPSTREAM.orig.tar.gz
+ TARBALL_GZ=${PACKAGE}_$UPSTREAM.orig.tar.gz
+ TARBALL_BZ2=${PACKAGE}_$UPSTREAM.orig.tar.bz2
WANTED_PACKAGEDIR="${PACKAGE}-${UPSTREAM}"
# see 375138 for why this doesn't work as well as it could. Fall back to apt-get source
# as a last resort.
- [ ! -e $TARBALL ] && \
+ [ ! -e $TARBALL_GZ -a ! -e $TARBALL_BZ2 ] && \
( uscan \
--rename \
--force-download \
@@ -80,7 +81,7 @@
--rename ||
apt-get source $PACKAGE --tar-only )
- if [ ! -e $TARBALL ]
+ if [ ! -e $TARBALL_GZ -a ! -e $TARBALL_BZ2 ]
then
echo "Couldn't download tarball with uscan or apt-get source. See above for errors"
exit 1
More information about the Pkg-haskell-commits
mailing list