manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correcting udeb download for derivatives to only fall back to debians repository if required to.

This commit is contained in:
Daniel Baumann 2011-02-15 11:02:12 +01:00
parent ad302fb50c
commit 97f30b4907
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/build/lb_binary_debian-installer
View File

@ -506,13 +506,13 @@ then
fi fi
# Sorting udebs # Sorting udebs
UDEBS="$(awk '/Filename: / { print $2 }' Packages)"
if [ "${LB_DERIVATIVE}" = true ] if [ "${LB_DERIVATIVE}" = true ]
then then
UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages.derivative)" UDEBS="$(awk '/Filename: / { print $2 }' Packages.derivative)"
fi fi
UDEBS="${UDEBS} $(awk '/Filename: / { print $2 }' Packages)"
# Downloading udebs # Downloading udebs
for UDEB in ${UDEBS} for UDEB in ${UDEBS}
do do
@ -522,7 +522,10 @@ then
cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./ cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
else else
# Downloading udebs # Downloading udebs
wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB} if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
then
wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
fi
fi fi
done done