# HG changeset patch # User Antoine Bodin # Date 1302198304 -7200 # Node ID bf25a03de4ff241aea236309f3f7f388af9cd466 # Parent 2e688470b0e5bc13d3c12a675c7dee038041124b# Parent b66bb5e94b73625b00df46d162fc8fc7cfc99fb9 Merge bugfixes from branch default diff -r 2e688470b0e5 -r bf25a03de4ff .hgtags --- a/.hgtags Thu Apr 07 19:05:12 2011 +0200 +++ b/.hgtags Thu Apr 07 19:45:04 2011 +0200 @@ -25,3 +25,4 @@ 7e7265ac0dc0858705f369998a140298c753854b 4.2.8 6860bdd720318dfe2cfd5d72b18ee694ffbd30d7 4.2.9 5092d208347191bb10a8f1a9d5412b5f451305e4 4.2.10 +a99465ca9b36dc10eaf8ca255306f2a78f4deb5a 4.2.11 diff -r 2e688470b0e5 -r bf25a03de4ff tazwok --- a/tazwok Thu Apr 07 19:05:12 2011 +0200 +++ b/tazwok Thu Apr 07 19:45:04 2011 +0200 @@ -511,7 +511,7 @@ check_for_tarball() { [ "$WGET_URL" ] || return 0 - [ "$WANTED" ] || return 0 + [ "$WANTED" ] && return 0 report step "Checking for source tarball: $PACKAGE" local repack_src=$repack_src TARBALL=$TARBALL local nounpack=$nounpack look_for_cookopt !unpack && nounpack=yes