From 580b246ae589e4b6011f6149e4680b1fa08497f4 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Fri, 13 Nov 2015 11:23:44 +0000 Subject: use log.i() instead of log() --- pbuilder | 20 +++++++------- pbuilder-buildpackage | 24 ++++++++--------- pbuilder-buildpackage-funcs | 8 +++--- pbuilder-checkparams | 6 ++--- pbuilder-createbuildenv | 14 +++++----- pbuilder-modules | 64 ++++++++++++++++++++++----------------------- pbuilder-runhooks | 4 +-- pbuilder-updatebuildenv | 12 ++++----- pdebuild | 2 +- pdebuild-checkparams | 4 +-- pdebuild-internal | 2 +- 11 files changed, 80 insertions(+), 80 deletions(-) diff --git a/pbuilder b/pbuilder index 582c689..d707569 100755 --- a/pbuilder +++ b/pbuilder @@ -42,11 +42,11 @@ case "$1" in shift; . /usr/lib/pbuilder/pbuilder-checkparams if [ -n "$BASEBUILDPLACE" ]; then - log "I: Cleaning [$BASEBUILDPLACE]" + log.i "Cleaning [$BASEBUILDPLACE]" clean_subdirectories "$BASEBUILDPLACE" || true fi if [ -n "$APTCACHE" ]; then - log "I: Cleaning [$APTCACHE]" + log.i "Cleaning [$APTCACHE]" rm "$APTCACHE"/* || true fi ;; @@ -60,9 +60,9 @@ case "$1" in trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then - log "I: entering the shell" + log.i "entering the shell" else - log "I: entering the shell + log.i "entering the shell File extracted to: $BUILDPLACE " fi @@ -80,7 +80,7 @@ File extracted to: $BUILDPLACE log "E: Invalid combination of internal-build-uml and save-after-login flags" exit 1 else - log "I: Saving the results, modifications to this session will persist" + log.i "Saving the results, modifications to this session will persist" umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -127,7 +127,7 @@ File extracted to: $BUILDPLACE if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then log "E: Invalid combination of internal-build-uml and save-after-login flags" else - log "I: Saving the results, modifications to this session will persist" + log.i "Saving the results, modifications to this session will persist" umountproc trap cleanbuildplace_trap exit sighup ${CHROOTEXEC} /usr/bin/apt-get clean || true @@ -147,12 +147,12 @@ File extracted to: $BUILDPLACE extractbuildplace trap umountproc_cleanbuildplace_trap exit sighup executehooks "F" - log "I: start dump config" - log "I: set" + log.i "start dump config" + log.i "set" set; - log "I: env" + log.i "env" env; - log "I: end dump config" + log.i "end dump config" ;; --debuild|debuild) shift diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index ae1a0a9..b5468b5 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -39,7 +39,7 @@ if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then SUTOUSER="LD_PRELOAD= LOGNAME=$BUILDUSERNAME USER=$BUILDUSERNAME /sbin/start-stop-daemon --start --pidfile /dev/null --chuid $BUILDUSERNAME --startas /bin/sh" DEBBUILDOPTS="${DEBBUILDOPTS:+$DEBBUILDOPTS }-rfakeroot" EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot" - log "I: using fakeroot in build." + log.i "using fakeroot in build." else # run the build in root BUILDUSERID=0 @@ -59,13 +59,13 @@ case $USENETWORK in if /usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper true; then USENETWORK=no UNSHARE="/usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper" - log "I: pbuilder: network access will be disabled during build" + log.i "pbuilder: network access will be disabled during build" else USENETWORK=yes if [ "$DEB_BUILD_ARCH_OS" = "linux" ]; then log "W: pbuilder: unshare CLONE_NEWNET not available" fi - log "I: pbuilder: network access is available during build!" + log.i "pbuilder: network access is available during build!" fi ;; esac @@ -84,7 +84,7 @@ if [ ! -d "${BUILDRESULT}" ]; then mkdir -p "${BUILDRESULT}" fi if [ -d "${BUILDRESULT}" ]; then - log "I: created buildresult dir: ${BUILDRESULT}" + log.i "created buildresult dir: ${BUILDRESULT}" else log "E: failed creating buildresult dir: ${BUILDRESULT}" exit 1 @@ -96,7 +96,7 @@ if [ -z "${PBUILDER_BUILD_LOGFILE}" ]; then PBUILDER_BUILD_LOGFILE="${BUILDRESULT}/$(basename "${PACKAGENAME}" .dsc)${PKGNAME_LOGFILE_EXTENSION}" exec > >(tee "${PBUILDER_BUILD_LOGFILE}") 2>&1 PBUILDER_BUILD_LOGFILE=$(readlink -f "${PBUILDER_BUILD_LOGFILE}") - log "I: Using pkgname logfile" + log.i "Using pkgname logfile" echobacktime fi fi @@ -113,18 +113,18 @@ createbuilduser CCACHE_ENV= setup_ccache SUTOUSER="$CCACHE_ENV $SUTOUSER" -log "I: Installing the build-deps" +log.i "Installing the build-deps" executehooks "D" trap saveaptcache_umountproc_cleanbuildplace_trap exit sighup sigpipe checkbuilddep "$PACKAGENAME" save_aptcache trap umountproc_cleanbuildplace_trap exit sighup sigpipe -log "I: Copying source file" +log.i "Copying source file" copydsc "$PACKAGENAME" "${BUILDPLACE}$BUILDDIR" copyinputfile "${BUILDPLACE}$BUILDDIR" -log "I: Extracting source" +log.i "Extracting source" if echo "chown $BUILDUSERNAME:$BUILDUSERNAME $BUILDDIR $BUILDDIR/*" | $CHROOTEXEC /bin/bash; then : # success else @@ -138,7 +138,7 @@ else exit 1; fi -log "I: Building the package" +log.i "Building the package" executehooks "A" @@ -153,7 +153,7 @@ unset DISPLAY DPKG_COMMANDLINE="$DPKG_COMMANDLINE && $DPKG_COMMANDLINE" fi DPKG_COMMANDLINE="cd ${BUILDDIR}/*/ && $DPKG_COMMANDLINE" - log "I: Running $DPKG_COMMANDLINE" + log.i "Running $DPKG_COMMANDLINE" echo "$DPKG_COMMANDLINE" | $UNSHARE $CHROOTEXEC env $SUTOUSER ) & BUILD_PID=$! @@ -161,7 +161,7 @@ if [ -n "${TIMEOUT_TIME}" ]; then ( : Timeout process sleep "${TIMEOUT_TIME}" - log "I: Terminating build process due to timeout " + log.i "Terminating build process due to timeout " kill "${BUILD_PID}" || true ) & # timeout process KILL_WAIT_PID="kill $! || true; echo \"I: Terminate timeout process\"; " @@ -195,7 +195,7 @@ if [ -d "${BUILDRESULT}" ]; then fi done for FILE in "${ADDITIONAL_BUILDRESULTS[@]}"; do - log "I: Trying to save additional result ${FILE}" + log.i "Trying to save additional result ${FILE}" cp -a "${BUILDPLACE}$BUILDDIR/"*"/${FILE}" "${BUILDRESULT}" || true done executehooks "I" diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index e0aabfa..c3eeee7 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -37,7 +37,7 @@ function copydsc () { local DSCFILE=$(getdscfiles "$1") local TARGET="$2" for FILE in ${DSCFILE[@]} ; do - log "I: copying [$FILE]" + log.i "copying [$FILE]" cp -p "$FILE" "$TARGET" done } @@ -68,8 +68,8 @@ function checkbuilddep () { function showbuildbanner () { # show some banners for building - log "I: pbuilder-buildpackage/"$(dpkg --print-architecture) - log "I: $1" + log.i "pbuilder-buildpackage/"$(dpkg --print-architecture) + log.i "$1" } function cowprotect () { @@ -114,7 +114,7 @@ function createbuilduser () { function setup_ccache() { if [ -n "$CCACHEDIR" ]; then - log "I: Setting up ccache" + log.i "Setting up ccache" if ! [ -d "$BUILDPLACE/$CCACHEDIR" ]; then mkdir -p "$BUILDPLACE/$CCACHEDIR" fi diff --git a/pbuilder-checkparams b/pbuilder-checkparams index 15f26cc..e41c8ae 100755 --- a/pbuilder-checkparams +++ b/pbuilder-checkparams @@ -165,7 +165,7 @@ while [ -n "$1" ]; do shift; shift; ;; --logfile) - log "I: Logging to $2" + log.i "Logging to $2" exec > >(tee "$2") 2>&1 PBUILDER_BUILD_LOGFILE=$(readlink -f "$2") shift; shift; @@ -255,13 +255,13 @@ while [ -n "$1" ]; do ;; --no-targz) # specify this option if I am running in no-targz mode - log "I: Running in no-targz mode" + log.i "Running in no-targz mode" INTERNAL_BUILD_UML="yes" shift; ;; --internal-build-uml) # specify this option if I am running inside UML. - log "I: Running in pbuilder-user-mode-linux mode" + log.i "Running in pbuilder-user-mode-linux mode" INTERNAL_BUILD_UML="yes" IGNORE_UMOUNT="no" shift; diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv index 39f3c31..4a2bf25 100755 --- a/pbuilder-createbuildenv +++ b/pbuilder-createbuildenv @@ -25,7 +25,7 @@ set -e if [ -z "$DISTRIBUTION" ]; then DISTRIBUTION=sid fi -log "I: Distribution is $DISTRIBUTION." +log.i "Distribution is $DISTRIBUTION." if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " @@ -39,7 +39,7 @@ echobacktime # first clean it. cleanbuildplace -log "I: Building the build environment" +log.i "Building the build environment" mkdir -p "$BUILDPLACE" if [ ! -d "$BUILDPLACE" ]; then log "E: Could not make directory [$BUILDPLACE]" @@ -48,12 +48,12 @@ fi $TRAP cleanbuildplace exit -log "I: running $DEBOOTSTRAP" +log.i "running $DEBOOTSTRAP" unset DEBOOTSTRAPSCRIPT if [ -n "$HOOKDIR" ]; then if [ -f "$HOOKDIR/$DISTRIBUTION" ]; then DEBOOTSTRAPSCRIPT=$(readlink -f "$HOOKDIR")"/$DISTRIBUTION" - log "I: Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" + log.i "Applying user distribution dist build script $DEBOOTSTRAPSCRIPT" fi fi @@ -79,7 +79,7 @@ if ! ( "${DEBOOTSTRAP}" \ exit 1 fi -log "I: debootstrap finished" +log.i "debootstrap finished" mkdir -p "${BUILDPLACE}$BUILDDIR" @@ -89,8 +89,8 @@ installaptlines add_additional_aptkeyrings executehooks "G" -log "I: Refreshing the base.tgz " -log "I: upgrading packages" +log.i "Refreshing the base.tgz " +log.i "upgrading packages" mountproc $TRAP umountproc_cleanbuildplace_trap exit sighup $CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update diff --git a/pbuilder-modules b/pbuilder-modules index 806f6f0..8bcfb1f 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -169,10 +169,10 @@ function umount_one () { DEB_BUILD_ARCH_OS=$(dpkg-architecture -qDEB_BUILD_ARCH_OS) if [ "${IGNORE_UMOUNT}" = "yes" ]; then # support ignore umount option. - log "I: ignoring umount of $1 filesystem" + log.i "ignoring umount of $1 filesystem" return fi - log "I: unmounting $1 filesystem" + log.i "unmounting $1 filesystem" local UMOUNT_OUTPUT if ! UMOUNT_OUTPUT="$(LC_ALL=C umount "$BUILDPLACE/$1" 2>&1)"; then log "W: Could not unmount $1: $UMOUNT_OUTPUT" @@ -267,7 +267,7 @@ function mountproc () { local -a mounted DEB_BUILD_ARCH_OS=$(dpkg-architecture -qDEB_BUILD_ARCH_OS) if [ "$USEPROC" = "yes" ]; then - log "I: mounting /proc filesystem" + log.i "mounting /proc filesystem" mkdir -p "$BUILDPLACE/proc" case "$DEB_BUILD_ARCH_OS" in kfreebsd) @@ -286,19 +286,19 @@ function mountproc () { mounted[${#mounted[@]}]="$BUILDPLACE/proc" fi if [ "$USEDEVFS" = "yes" ]; then - log "I: mounting /dev filesystem" + log.i "mounting /dev filesystem" mkdir -p "$BUILDPLACE/dev" || true mount -t devfs /dev "$BUILDPLACE/dev" mounted[${#mounted[@]}]="$BUILDPLACE/dev" fi if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USERUNSHM" = "yes" ]; then - log "I: mounting /run/shm filesystem" + log.i "mounting /run/shm filesystem" mkdir -p "$BUILDPLACE/run/shm" || true mount -t tmpfs tmpfs "$BUILDPLACE/run/shm" mounted[${#mounted[@]}]="$BUILDPLACE/run/shm" fi if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then - log "I: mounting /dev/pts filesystem" + log.i "mounting /dev/pts filesystem" mkdir -p "$BUILDPLACE/dev/pts" || true TTYGRP=5 TTYMODE=620 @@ -307,7 +307,7 @@ function mountproc () { mounted[${#mounted[@]}]="$BUILDPLACE/dev/pts" fi if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then - log "I: mounting selinux filesystem" + log.i "mounting selinux filesystem" local SELINUX="$(grep -m 1 ^selinuxfs /proc/mounts | cut -d ' ' -f 2)" mkdir -p "$BUILDPLACE/$SELINUX" mount --bind "$SELINUX" "$BUILDPLACE/$SELINUX" @@ -325,7 +325,7 @@ function mountproc () { MOUNTPARAMS="-obind" [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ] && MOUNTPARAMS="-t nullfs" for mnt in $BINDMOUNTS; do - log "I: Mounting $mnt" + log.i "Mounting $mnt" if mkdir -p "$BUILDPLACE/$mnt" && mount $MOUNTPARAMS "$mnt" "$BUILDPLACE/$mnt"; then # successful. @@ -334,9 +334,9 @@ function mountproc () { # this part of code is the only part which is supposed to fail. # When unsuccessful, backtrack / umount and abort. if [ -n "${mounted[*]}" ]; then - log "I: error recovery: umount successfully mounted mount-points: ${mounted[@]}" + log.i "error recovery: umount successfully mounted mount-points: ${mounted[@]}" for umnt in "${mounted[@]}"; do - log "I: umounting $umnt" + log.i "umounting $umnt" umount "$umnt" done fi @@ -344,9 +344,9 @@ function mountproc () { fi done if [ -f "$BUILDPLACE/usr/sbin/policy-rc.d" ]; then - log "I: policy-rc.d already exists" + log.i "policy-rc.d already exists" else - log "I: installing dummy policy-rc.d" + log.i "installing dummy policy-rc.d" echo "\ #!/bin/sh @@ -374,7 +374,7 @@ function clean_subdirectories () { log "W: directory $1 does not exist in clean_subdirectories" return; fi - log "I: removing directory $1 and its subdirectories" + log.i "removing directory $1 and its subdirectories" find "$1" -xdev \( \! -type d \) -print0 |xargs -0 rm -f find "$1" -xdev -depth -type d -print0 | \ (xargs -0 rmdir || true) @@ -400,7 +400,7 @@ function cleanbuildplace () { if mount |grep -q -F " $(readlink -f "$BUILDPLACE")/"; then log "E: Something is still mounted under ${BUILDPLACE}; unmount and remove ${BUILDPLACE} manually" else - log "I: cleaning the build env " + log.i "cleaning the build env " clean_subdirectories "$BUILDPLACE" fi fi; @@ -423,7 +423,7 @@ function saveaptcache_umountproc_cleanbuildplace () { } function installaptlines (){ - log "I: Installing apt-lines" + log.i "Installing apt-lines" rm -f "$BUILDPLACE"/etc/apt/sources.list if [ -z "$DISTRIBUTION" ]; then log "E: Distribution not specified, please specify" @@ -439,12 +439,12 @@ deb $MIRRORSITE $DISTRIBUTION $COMPONENTS EOF fi if [ -n "$APTCONFDIR" ]; then - log "I: Copy " "$APTCONFDIR"/* " to chroot" + log.i "Copy " "$APTCONFDIR"/* " to chroot" cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt fi if [ ! -d "$BUILDPLACE"/etc/apt/apt.conf.d ]; then - log "I: Create /etc/apt/apt.conf.d/ inside chroot" + log.i "Create /etc/apt/apt.conf.d/ inside chroot" mkdir "$BUILDPLACE"/etc/apt/apt.conf.d fi @@ -454,7 +454,7 @@ APT::Install-Recommends "false"; Acquire::Languages none; EOF if [ -n "$EXPERIMENTAL" ]; then - log "I: Installing apt-lines and pinning for experimental" + log.i "Installing apt-lines and pinning for experimental" if [ -n "$MIRRORSITE" ] ; then echo "deb $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list echo "#deb-src $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list @@ -466,9 +466,9 @@ EOF } function copy_local_configuration () { - log "I: copying local configuration" + log.i "copying local configuration" if [ -n "$CONFDIR" ] && [ -d "$CONFDIR" ]; then - log "I: copying files from $CONFDIR (if possible) instead of using the system ones" + log.i "copying files from $CONFDIR (if possible) instead of using the system ones" fi for a in hosts hostname resolv.conf mailname; do if [ -n "$CONFDIR" ] && [ -f "$CONFDIR/$a" ]; then @@ -489,12 +489,12 @@ function extractbuildplace () { if [ "${INTERNAL_BUILD_UML}" != "yes" -a ! \( "${PRESERVE_BUILDPLACE}" = "yes" -a -d "$BUILDPLACE" \) ]; then cleanbuildplace - log "I: Building the build Environment" + log.i "Building the build Environment" if ! mkdir -p "$BUILDPLACE"; then log "E: failed to build the directory to chroot" exit 1 fi - log "I: extracting base tarball [${BASETGZ}]" + log.i "extracting base tarball [${BASETGZ}]" if [ ! -f "$BASETGZ" ]; then log "E: failed to find $BASETGZ, have you done to create your base tarball yet?" exit 1 @@ -547,8 +547,8 @@ function extractbuildplace () { } function echobacktime () { - log "I: Current time: $(date)" - log "I: pbuilder-time-stamp: $(date +%s)" + log.i "Current time: $(date)" + log.i "pbuilder-time-stamp: $(date +%s)" } function recover_aptcache() { @@ -560,7 +560,7 @@ function recover_aptcache() { else doit=cp fi - log "I: Obtaining the cached apt archive contents" + log.i "Obtaining the cached apt archive contents" find "$APTCACHE" -maxdepth 1 -name \*.deb | \ while read A ; do $doit "$A" "$BUILDPLACE/var/cache/apt/archives/" || true @@ -573,7 +573,7 @@ function save_aptcache() { # it is safe to call this function several times. local doit if [ -n "$APTCACHE" ]; then - log "I: Copying back the cached apt archive contents" + log.i "Copying back the cached apt archive contents" mkdir -p "$APTCACHE" ; if [ "$APTCACHEHARDLINK" = "yes" ]; then doit=ln @@ -583,7 +583,7 @@ function save_aptcache() { find "$BUILDPLACE/var/cache/apt/archives/" -maxdepth 1 -name \*.deb | \ while read A ;do if [ ! -f "$APTCACHE/$(basename "$A")" -a -f "$A" ]; then - log "I: new cache content '$(basename "$A")' added" + log.i "new cache content '$(basename "$A")' added" $doit "$A" "$APTCACHE/" || true fi done @@ -600,10 +600,10 @@ function create_basetgz() { exit 1; fi while test -f "${BASETGZ}.tmp"; do - log "I: Someone else has lock over ${BASETGZ}.tmp, waiting" + log.i "Someone else has lock over ${BASETGZ}.tmp, waiting" sleep 10s done - log "I: creating base tarball [${BASETGZ}]" + log.i "creating base tarball [${BASETGZ}]" if [ -h "$BUILDPLACE/tmp/buildd" ] && [ "$(readlink -f "$BUILDPLACE/tmp/buildd")" = "${BUILDPLACE}$BUILDDIR" ]; then rm "$BUILDPLACE/tmp/buildd" fi @@ -624,7 +624,7 @@ function copyinputfile() { exit 1x fi if [ -n "$INPUTFILE" ]; then - log "I: copy ${INPUTFILE[*]} to target directory" + log.i "copy ${INPUTFILE[*]} to target directory" cp "${INPUTFILE[@]}" "${TARGETDIR}" fi } @@ -674,7 +674,7 @@ function conditional_cp_a() { if [ "${parent_dir}" != "${target_dir}" ]; then "$cp" -a "$source_file" "$target_dir" else - log "I: file ${source_file} is already in target, not copying." + log.i "file ${source_file} is already in target, not copying." fi } @@ -682,7 +682,7 @@ function add_additional_aptkeyrings() { # To support package verification inside the repository we may have to import # additional keys. for KEY in "${APTKEYRINGS[@]}"; do - log "I: adding apt key file ${KEY}." + log.i "adding apt key file ${KEY}." $CHROOTEXEC /usr/bin/apt-key add - < "${KEY}" > /dev/null done } diff --git a/pbuilder-runhooks b/pbuilder-runhooks index 0b921b0..6e912b0 100644 --- a/pbuilder-runhooks +++ b/pbuilder-runhooks @@ -85,10 +85,10 @@ function executehooks () { ;; *) if [ -x "$fn" ]; then - log "I: user script $fn starting" + log.i "user script $fn starting" BUILDDIR="$BUILDDIR" \ $CHROOTEXEC "/$hooks/$(basename "$fn")" - log "I: user script $fn finished" + log.i "user script $fn finished" else if [ -f "$fn" ]; then filetype=$(basename "$fn" ) diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv index f0441eb..d370f8f 100755 --- a/pbuilder-updatebuildenv +++ b/pbuilder-updatebuildenv @@ -21,7 +21,7 @@ set -e . "${BASH_SOURCE%/*}/pbuilder-checkparams" if [ -n "$DISTRIBUTION" ] && [ "$OVERRIDE_APTLINES" = "yes" ]; then - log "I: Upgrading for distribution $DISTRIBUTION" + log.i "Upgrading for distribution $DISTRIBUTION" fi if [ "${PBUILDER_DEBUGMODE}" = "yes" ]; then TRAP="echo ignoring trap " @@ -35,8 +35,8 @@ echobacktime extractbuildplace $TRAP umountproc_cleanbuildplace_trap exit sighup -log "I: Refreshing the base.tgz " -log "I: upgrading packages" +log.i "Refreshing the base.tgz " +log.i "upgrading packages" $CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update @@ -74,7 +74,7 @@ recover_aptcache $TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup if [ "$DEBDELTA" = "yes" ]; then if $CHROOTEXEC hash debdelta-upgrade 2> /dev/null ; then - log "I: Using debdelta-upgrade for available deltas" + log.i "Using debdelta-upgrade for available deltas" if $CHROOTEXEC debdelta-upgrade ; then : else @@ -104,13 +104,13 @@ add_additional_aptkeyrings # optionally auto-clean apt-cache if [ "${AUTOCLEANAPTCACHE}" = "yes" -a -n "$APTCACHE" ]; then - log "I: Cleaning the cached apt archive" + log.i "Cleaning the cached apt archive" $CHROOTEXEC /usr/bin/apt-get autoclean || true find "$APTCACHE/" -maxdepth 1 -name \*.deb | \ while read A; do if [ ! -f "$BUILDPLACE/var/cache/apt/archives/$(basename "$A")" -a \ -f "$A" ]; then - log "I: obsolete cache content "$(basename "$A")" removed" + log.i "obsolete cache content "$(basename "$A")" removed" rm -f "$A" || true fi done diff --git a/pdebuild b/pdebuild index 6a70db1..af7b365 100644 --- a/pdebuild +++ b/pdebuild @@ -65,7 +65,7 @@ if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then done conditional_cp_a ../${CHANGES} "${BUILDRESULT}" for files in "${ADDITIONAL_BUILDRESULTS[@]}"; do - log "I: Trying to save additional result ${files}" + log.i "Trying to save additional result ${files}" conditional_cp_a "${files}" "${BUILDRESULT}" || true done else diff --git a/pdebuild-checkparams b/pdebuild-checkparams index b6ba0ed..0bcfc67 100644 --- a/pdebuild-checkparams +++ b/pdebuild-checkparams @@ -89,13 +89,13 @@ while [ -n "$1" ]; do shift; ;; --logfile) - log "I: Logging to $2" + log.i "Logging to $2" PBUILDER_BUILD_LOGFILE=$(readlink -f $2) exec > >(tee "$2") 2>&1 shift; shift; ;; --pbuilder) - log "I: using $2 as pbuilder" + log.i "using $2 as pbuilder" PDEBUILD_PBUILDER="$2" shift; shift; ;; diff --git a/pdebuild-internal b/pdebuild-internal index 7056464..7f61a66 100644 --- a/pdebuild-internal +++ b/pdebuild-internal @@ -48,7 +48,7 @@ while [ -n "$1" ]; do --debbuildopts) # append to DEBBUILDOPTS or reset to empty if $2 isn't set DEBBUILDOPTS="${2:+${DEBBUILDOPTS:+$DEBBUILDOPTS }$2}"; - log "I: Setting DEBBUILDOPTS=$DEBBUILDOPTS" + log.i "Setting DEBBUILDOPTS=$DEBBUILDOPTS" shift; shift; ;; --uid) -- cgit v1.2.3