josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* Remove aptsources lists in bootstrap phase (Closes: #593561) * Improve check-deps to find missing packages * [INTL:fr] French program translation update (Closes: #598873)

Browse source 
git-svn-id: http://emdebian.org/svn/current@7520 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-10-03 15:27:20 +00:00
parent 330201d187
commit c22ce6e129
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
check-deps.sh
View file

@ -63,6 +63,9 @@ for pkg in $DEPS; do
if [ "apt" = "$name" ]; then if [ "apt" = "$name" ]; then
continue continue
fi fi
if [ -z "$name" ]; then
continue
fi
orlist=$(echo $pkg|grep "|" || true) orlist=$(echo $pkg|grep "|" || true)
while [ -n "$orlist" ]; do while [ -n "$orlist" ]; do
ORPKG=`echo $pkg|cut -d'|' -f2|sed -e 's/^ //'` ORPKG=`echo $pkg|cut -d'|' -f2|sed -e 's/^ //'`
@ -82,22 +85,22 @@ for pkg in $DEPS; do
set +e set +e
CHECK=`dpkg --compare-versions $POLICY "$VERCMP" $VERLIMIT ; echo $?` CHECK=`dpkg --compare-versions $POLICY "$VERCMP" $VERLIMIT ; echo $?`
set -e set -e
fi if [ -z "$CHECK" ]; then
if [ -z "$CHECK" ]; then VERLIMIT=
VERLIMIT= VERCMP=
VERCMP= name=$(echo $ALTERNATE|sed -e 's/^ //'|cut -d' ' -f1)
name=$(echo $ALTERNATE|sed -e 's/^ //'|cut -d' ' -f1) if [ -n `echo $ALTERNATE|grep '('` ]; then
if [ -n `echo $ALTERNATE|grep '('` ]; then VERLIMIT=`echo $ALTERNATE|cut -d'(' -f2|tr -d ')'|tr -d '\n'|grep -v $name || true`
VERLIMIT=`echo $ALTERNATE|cut -d'(' -f2|tr -d ')'|tr -d '\n'|grep -v $name || true` VERCMP=`echo $VERLIMIT|sed -e 's/\(.*\) \(.*\)/\1/'`
VERCMP=`echo $VERLIMIT|sed -e 's/\(.*\) \(.*\)/\1/'` VERLIMIT=`echo $VERLIMIT|sed -e 's/\(.*\) \(.*\)/\2/'`
VERLIMIT=`echo $VERLIMIT|sed -e 's/\(.*\) \(.*\)/\2/'` fi
fi POLICY=`LC_ALL=C apt-cache policy $name 2>/dev/null|grep Candidate|cut -d':' -f2-3|tr -d ' '`
POLICY=`LC_ALL=C apt-cache policy $name 2>/dev/null|grep Candidate|cut -d':' -f2-3|tr -d ' '` if [ -n "$POLICY" ]; then
if [ -n "$POLICY" ]; then if [ -n "$VERLIMIT" ]; then
if [ -n "$VERLIMIT" ]; then set +e
set +e CHECK=`dpkg --compare-versions $POLICY "$VERCMP" $VERLIMIT ; echo $?`
CHECK=`dpkg --compare-versions $POLICY "$VERCMP" $VERLIMIT ; echo $?` set -e
set -e fi
fi fi
fi fi
fi fi
@ -113,6 +116,10 @@ for pkg in $DEPS; do
if [ -n "$YES" ]; then if [ -n "$YES" ]; then
CMD="$CMD -y $name" CMD="$CMD -y $name"
fi 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 done
if [ -n "$ERR" ]; then if [ -n "$ERR" ]; then
echo Some packages are not available: $ERR echo Some packages are not available: $ERR

11
debian/changelog vendored
View file

@ -6,14 +6,18 @@ multistrap (2.1.8) experimental; urgency=low
* Add more synopsis information to manual page. (Closes: #592621) * Add more synopsis information to manual page. (Closes: #592621)
* Aim 2.1.8 at experimental as squeeze is frozen and this version * Aim 2.1.8 at experimental as squeeze is frozen and this version
includes possibly disruptive changes. includes possibly disruptive changes.
* Remove aptsources lists in bootstrap phase (Closes: #593561)
[Wookey] [ Wookey ]
* Add support for 'flat' apt-ftparchive-style URLs * Add support for 'flat' apt-ftparchive-style URLs
* Include chroot.sh preventing services being started during chroot creation * Include chroot.sh preventing services being started during chroot creation
* Always use the host apt keyring when bootstrapping, since we don't * Always use the host apt keyring when bootstrapping, since we don't
have one yet in the target root. 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 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) * [INTL:vi] Vietnamese program translation update (Closes: #598476)
* Pre-handle keyring packages using GPG for use with apt >= 0.8 * Pre-handle keyring packages using GPG for use with apt >= 0.8
(Closes: #595017) (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 multistrap (2.1.6) unstable; urgency=low