diff options
| -rw-r--r-- | pbuilder-buildpackage-funcs | 2 | ||||
| -rwxr-xr-x | pbuilder-createbuildenv | 6 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-aptitude | 2 | ||||
| -rwxr-xr-x | pbuilder-updatebuildenv | 8 | ||||
| -rw-r--r-- | pdebuild-internal | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 370c799..023dbca 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -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 } diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index b0cb6c3..864e0a5 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -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" diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude index dafdc4f..f2c301f 100755 --- a/pbuilder-satisfydepends-aptitude +++ b/pbuilder-satisfydepends-aptitude @@ -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 diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index 0915981..ecbc60f 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -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 diff --git a/pdebuild-internal b/pdebuild-internal index ce624b2..54ca58f 100644 --- a/pdebuild-internal +++ b/pdebuild-internal @@ -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 |