summaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2010-01-06 18:08:56 (GMT)
committerOtavio Salvador <otavio@debian.org>2010-01-06 18:08:56 (GMT)
commit6d37094ebc77409bd0b7333964ba33cf561b94e1 (patch)
tree1adde4ff195b1639dab80ebe35a78012fc533d1b /functions
parenta858e35a0d914720a6237e7903e46aab92752078 (diff)
downloaddebootstrap-6d37094ebc77409bd0b7333964ba33cf561b94e1.zip
debootstrap-6d37094ebc77409bd0b7333964ba33cf561b94e1.tar.gz
debootstrap-6d37094ebc77409bd0b7333964ba33cf561b94e1.tar.bz2
Apply patch from Andres Salomon <dilinger@collabora.co.uk> to fix iteration through components in download_main (closes: #561298).
r61942
Diffstat (limited to 'functions')
-rw-r--r--functions5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions b/functions
index 8090c19..14f86ff 100644
--- a/functions
+++ b/functions
@@ -684,7 +684,10 @@ download_main () {
local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
if [ ! -e "$pkgdest" ]; then continue; fi
details="$($PKGDETAILS PKGS "$m" "$pkgdest" "$p")"
- if [ "$details" = "$p -" ]; then continue; fi
+ if [ "$details" = "$p -" ]; then
+ details=""
+ continue
+ fi
size="${details##* }"; details="${details% *}"
md5="${details##* }"; details="${details% *}"
local debdest="$($DLDEST deb $details)"