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

installer: robustify udeb inclusion 

move the code that checks whether a version of a given package has already
been obtained (to account for parent and derived both listing the same
package) to guard the copy from cache action also, not just the download
action.

in rare but possible scenarios it would have been possible to end up with
both the parent and derived copies of a package included.

Partial fix for #952914

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-02-13 03:26:53 +00:00
parent 6997f99c9f
commit 2e3f195c38
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/build/installer_debian-installer
View File

@ -546,14 +546,15 @@ then
for UDEB in ${UDEBS}
do
# Copy from cache if available, otherwise download
if [ -f ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ]
_UDEB_FILENAME="$(basename ${UDEB})"
# Skip if already got (any version), i.e. should parent and derive both list it
if ! ls "$(${_UDEB_FILENAME} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
then
cp ../cache/packages.installer_debian-installer.udeb/"$(basename ${UDEB})" ./
else
# Skip if already got (any version), i.e. should parent and derive both list it
if ! ls "$(basename ${UDEB} | awk -F_ '{ print $1 }')"_* > /dev/null 2>&1
# Copy from cache if available, otherwise download
if [ -f ../cache/packages.installer_debian-installer.udeb/"${_UDEB_FILENAME}" ]
then
cp ../cache/packages.installer_debian-installer.udeb/"${_UDEB_FILENAME}" ./
else
wget ${WGET_OPTIONS} "${LB_MIRROR_CHROOT}"/${UDEB} || wget ${WGET_OPTIONS} "${LB_PARENT_MIRROR_CHROOT}"/${UDEB}
fi
fi