* Remove aptsources lists in bootstrap phase (Closes: #593561) * Improve check-deps to find missing packages * [INTL:fr] French program translation update (Closes: #598873)
git-svn-id: http://emdebian.org/svn/current@7520 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
parent
330201d187
commit
c22ce6e129
2 changed files with 31 additions and 19 deletions
|
@ -63,6 +63,9 @@ for pkg in $DEPS; do
|
|||
if [ "apt" = "$name" ]; then
|
||||
continue
|
||||
fi
|
||||
if [ -z "$name" ]; then
|
||||
continue
|
||||
fi
|
||||
orlist=$(echo $pkg|grep "|" || true)
|
||||
while [ -n "$orlist" ]; do
|
||||
ORPKG=`echo $pkg|cut -d'|' -f2|sed -e 's/^ //'`
|
||||
|
@ -82,7 +85,6 @@ for pkg in $DEPS; do
|
|||
set +e
|
||||
CHECK=`dpkg --compare-versions $POLICY "$VERCMP" $VERLIMIT ; echo $?`
|
||||
set -e
|
||||
fi
|
||||
if [ -z "$CHECK" ]; then
|
||||
VERLIMIT=
|
||||
VERCMP=
|
||||
|
@ -101,6 +103,7 @@ for pkg in $DEPS; do
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
ERR="$ERR $name "
|
||||
fi
|
||||
|
@ -113,6 +116,10 @@ for pkg in $DEPS; do
|
|||
if [ -n "$YES" ]; then
|
||||
CMD="$CMD -y $name"
|
||||
fi
|
||||
MISSING=`dpkg-query -W -f '\${Status}' $name 2>/dev/null | grep "install ok installed"|sed -e 's/ //g'`
|
||||
if [ -z "$MISSING" ]; then
|
||||
CMD="$CMD $name"
|
||||
fi
|
||||
done
|
||||
if [ -n "$ERR" ]; then
|
||||
echo Some packages are not available: $ERR
|
||||
|
|
9
debian/changelog
vendored
9
debian/changelog
vendored
|
@ -6,6 +6,7 @@ multistrap (2.1.8) experimental; urgency=low
|
|||
* Add more synopsis information to manual page. (Closes: #592621)
|
||||
* Aim 2.1.8 at experimental as squeeze is frozen and this version
|
||||
includes possibly disruptive changes.
|
||||
* Remove aptsources lists in bootstrap phase (Closes: #593561)
|
||||
|
||||
[ Wookey ]
|
||||
* Add support for 'flat' apt-ftparchive-style URLs
|
||||
|
@ -13,7 +14,10 @@ multistrap (2.1.8) experimental; urgency=low
|
|||
* Always use the host apt keyring when bootstrapping, since we don't
|
||||
have one yet in the target root.
|
||||
|
||||
-- Neil Williams <codehelp@debian.org> Sat, 02 Oct 2010 16:53:47 +0100
|
||||
[ Neil Williams ]
|
||||
* Improve check-deps to find missing packages
|
||||
|
||||
-- Neil Williams <codehelp@debian.org> Sun, 03 Oct 2010 16:17:16 +0100
|
||||
|
||||
multistrap (2.1.7) unstable; urgency=low
|
||||
|
||||
|
@ -29,8 +33,9 @@ multistrap (2.1.7) unstable; urgency=low
|
|||
* [INTL:vi] Vietnamese program translation update (Closes: #598476)
|
||||
* Pre-handle keyring packages using GPG for use with apt >= 0.8
|
||||
(Closes: #595017)
|
||||
* [INTL:fr] French program translation update (Closes: #598873)
|
||||
|
||||
-- Neil Williams <codehelp@debian.org> Sat, 02 Oct 2010 16:27:01 +0100
|
||||
-- Neil Williams <codehelp@debian.org> Sat, 02 Oct 2010 19:26:02 +0100
|
||||
|
||||
multistrap (2.1.6) unstable; urgency=low
|
||||
|
||||
|
|
Loading…
Reference in a new issue