Commit aff01735 authored by Junichi Uekawa's avatar Junichi Uekawa

pass apt-get '-q' option to remove the progress.

It's probably not too useful when used non-interactively, and clutters output.
parent 5047167c
......@@ -50,7 +50,7 @@ function checkbuilddep () {
fi
# install extra packages to the chroot
if [ -n "$EXTRAPACKAGES" ]; then
$CHROOTEXEC usr/bin/apt-get -y --force-yes install ${EXTRAPACKAGES}
$CHROOTEXEC usr/bin/apt-get -q -y --force-yes install ${EXTRAPACKAGES}
fi
}
......
......@@ -82,13 +82,13 @@ log "I: Refreshing the base.tgz "
log "I: upgrading packages"
mountproc
$TRAP umountproc_cleanbuildplace_trap exit sighup
$CHROOTEXEC /usr/bin/apt-get update
$CHROOTEXEC /usr/bin/apt-get -q update
if [ -n "$REMOVEPACKAGES" ]; then
$CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
fi
recover_aptcache
$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
save_aptcache
executehooks "E"
......
......@@ -84,7 +84,7 @@ EOF
fi
$CHROOTEXEC sh -c "cat \"$BUILD_DEP_DEB_CONTROL\""
$CHROOTEXEC sh -c "dpkg-deb -b \"$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy\""
$CHROOTEXEC apt-get -y --force-yes install aptitude
$CHROOTEXEC apt-get -q -y --force-yes install aptitude
$CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true
$CHROOTEXEC aptitude -y --without-recommends -o APT::Install-Recommends=false -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy
# check whether the aptitude's resolver kept the package
......
......@@ -37,19 +37,19 @@ $TRAP umountproc_cleanbuildplace_trap exit sighup
loadhooks
log "I: Refreshing the base.tgz "
log "I: upgrading packages"
$CHROOTEXEC /usr/bin/apt-get update
$CHROOTEXEC /usr/bin/apt-get -q update
if [ -n "$REMOVEPACKAGES" ]; then
$CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
fi
recover_aptcache
$TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup
$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
# autoremove: Ignore error in case of etch because apt in etch doesn't
# support autoremove. TODO: Do not ignore error when etch is no longer
# supported.
$CHROOTEXEC /usr/bin/apt-get -y --force-yes autoremove || true
$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes autoremove || true
$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
save_aptcache
# optionally auto-clean apt-cache
......
......@@ -30,7 +30,7 @@ set -e
# I am probably running as root; make sure I have pbuilder installed here.
# passwd is needed as well because of useradd and groupadd calls.
apt-get install -y --force-yes pbuilder passwd
apt-get install -q -y --force-yes pbuilder passwd
# I'm not going to have the same LOGNAME as outside, I'm root.
export LOGNAME=root
......@@ -84,7 +84,7 @@ BUILDPLACE=
executehooks "D"
export PBCURRENTCOMMANDLINEOPERATION="pdebuild"
"$PBUILDERSATISFYDEPENDSCMD"
apt-get install -y --force-yes fakeroot
apt-get install -q -y --force-yes fakeroot
# create the user similar to that used outside
groupadd -g "${BUILDRESULTGID}" -o pbgroup
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment