* Fixed Joey's patch. ${LOCALDEBS:-$MIRROR} is correct syntax.

This commit is contained in:
Raphaël Hertzog 2000-07-06 10:32:27 +00:00
parent 7c4a271ff6
commit b53f3c80e1
3 changed files with 5 additions and 3 deletions

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ debian-cd (2.2.2) frozen unstable; urgency=low
* Fixed targets bin-image and src-image to use CD$(CD) instead of $(CD).
* Added "." after -F argument for symlink farm user. Closes: #66599
* Misc changes for woody i386 bootdisks --jwest
* Fixed the patch from Joey. :) ${LOCALDEBS:-$MIRROR} instead of
${LOCALDEBS:-MIRROR}. s/CODNAME/CODENAME/ too.
-- Raphael Hertzog <hertzog@debian.org> Fri, 30 Jun 2000 17:50:16 +0200

View File

@ -59,7 +59,7 @@ if [ ! -e "$APTTMP/$CODENAME-$ARCH/apt/sources.list" ]; then
fi
# Local packages ...
if [ -n "$LOCAL" ]; then
echo "deb file:${LOCALDEBS:-MIRROR} $CODENAME local" \
echo "deb file:${LOCALDEBS:-$MIRROR} $CODENAME local" \
>> $APTTMP/$CODENAME-$ARCH/apt/sources.list
fi
fi

View File

@ -87,8 +87,8 @@ if [ -n "$NONUS" -a "$CODENAME" = "slink" ]; then
fi
if [ -n "$LOCAL" ]; then
if [ -e ${LOCALDEBS:-MIRROR}/dists/$CODNAME/local/binary-$ARCH/Release ]; then
cp ${LOCALDEBS:-MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release \
if [ -e ${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release ]; then
cp ${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release \
dists/$CODENAME/local/binary-$ARCH/
fi
grep -v ^X-Medium $PREFIX.Packages-local \