use log.e() instead of log()

10 files changed, 35 insertions, 35 deletions

diff --git a/pbuilder b/pbuilder
index d707569..63cc7a9 100755
--- a/pbuilder
+++ b/pbuilder
@@ -77,7 +77,7 @@ File extracted to: $BUILDPLACE
 	# saving the place afterwards
 	if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then
 	    if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then
-		log "E: Invalid combination of internal-build-uml and save-after-login flags"
+		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"
@@ -101,7 +101,7 @@ File extracted to: $BUILDPLACE
 	EXECPROGRAM="$1"
 	shift
 	if [ ! -f "${EXECPROGRAM}" ]; then
-	    log "E: Command line parameter [$EXECPROGRAM] does not exist"
+	    log.e "Command line parameter [$EXECPROGRAM] does not exist"
 	    exit 1;
 	fi;
 	extractbuildplace
@@ -125,7 +125,7 @@ File extracted to: $BUILDPLACE
 	# saving the place afterwards
 	if [ "${SAVE_AFTER_LOGIN}" = "yes" ]; then
 	    if [ "${INTERNAL_BUILD_UML}" = "yes" ]; then
-		log "E: Invalid combination of internal-build-uml and save-after-login flags"
+		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"
 		umountproc
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 8504b10..54cf13e 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -26,7 +26,7 @@ set -e
 
 PACKAGENAME="$1"
 if [ ! -f "$PACKAGENAME" ]; then
-    log "E: Command line parameter [$PACKAGENAME] does not exist"
+    log.e "Command line parameter [$PACKAGENAME] does not exist"
     exit 1;
 fi;
 
@@ -86,7 +86,7 @@ if [ ! -d "${BUILDRESULT}" ]; then
     if [ -d "${BUILDRESULT}" ]; then
         log.i "created buildresult dir: ${BUILDRESULT}"
     else
-        log "E: failed creating buildresult dir: ${BUILDRESULT}"
+        log.e "failed creating buildresult dir: ${BUILDRESULT}"
         exit 1
     fi
 fi
@@ -128,13 +128,13 @@ log.i "Extracting source"
 if echo "chown $BUILDUSERNAME:$BUILDUSERNAME $BUILDDIR $BUILDDIR/*" | $CHROOTEXEC /bin/bash; then
     : # success
 else
-    log "E: pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME"
+    log.e "pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME"
     exit 1;
 fi
 if echo "( cd $BUILDDIR; env PATH=\"$PATH\" /usr/bin/dpkg-source -x $(basename "$PACKAGENAME") )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then
     : # success
 else
-    log "E: pbuilder: Failed extracting the source"
+    log.e "pbuilder: Failed extracting the source"
     exit 1;
 fi
 
@@ -172,7 +172,7 @@ fi
 if ! wait "${BUILD_PID}"; then
     trap umountproc_cleanbuildplace_trap exit sighup sigpipe
     eval "${KILL_WAIT_PID}"
-    log "E: Failed autobuilding of package"
+    log.e "Failed autobuilding of package"
     executehooks "C"
     exit 1;
 else
@@ -200,7 +200,7 @@ if [ -d "${BUILDRESULT}" ]; then
     done
     executehooks "I"
 else
-    log "E: BUILDRESULT=[$BUILDRESULT] is not a directory."
+    log.e "BUILDRESULT=[$BUILDRESULT] is not a directory."
 fi
 
 :
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index c3eeee7..e80555b 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -57,7 +57,7 @@ function checkbuilddep () {
         if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then
             trap umountproc_trap exit sighup
         fi
-        log "E: pbuilder-satisfydepends failed."
+        log.e "pbuilder-satisfydepends failed."
         exit 2
     fi
     # install extra packages to the chroot
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 81878a6..51aafab 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -49,7 +49,7 @@ while [ -n "$1" ]; do
 		    touch "$2";;
 	    esac
 	    if [ ! -f "$2" ]; then
-		log "E: File $2 does not exist"
+		log.e "File $2 does not exist"
 		exit 1
 	    fi
 	    BASETGZ=$(readlink -f "$2");
@@ -57,7 +57,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--buildplace)
 	    if [ ! -d "$2" ] ; then
-		log "E: Directory $2 does not exist"
+		log.e "Directory $2 does not exist"
 		exit 1
 	    fi
 	    BUILDPLACE=$(readlink -f "$2");
@@ -116,7 +116,7 @@ while [ -n "$1" ]; do
 		if [ -d "$2" ]; then
 		    APTCACHE=$(readlink -f "$2");
 		else
-		    log "E: Directory $2 does not exist"
+		    log.e "Directory $2 does not exist"
 		    exit 1
 		fi
 	    else
@@ -134,7 +134,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--configfile)
 	    if [ ! -f "$2" ]; then
-		log "E: Config file $2 does not exist"
+		log.e "Config file $2 does not exist"
 		exit 1
 	    fi
 	    . "$2";
@@ -231,7 +231,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--inputfile)
 	    if [ ! -f "$2" ]; then
-		log "E: Input file $2 does not exist"
+		log.e "Input file $2 does not exist"
 		exit 1
 	    fi
 	    INPUTFILE[${#INPUTFILE[@]}]="$2";
@@ -275,7 +275,7 @@ while [ -n "$1" ]; do
 	    break;
 	    ;;
 	--*)
-	    log "E: Unknown option [$1] was specified "
+	    log.e "Unknown option [$1] was specified "
 	    exit 1;
 	    ;;
 	*)
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 4a2bf25..9eaedbf 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -42,7 +42,7 @@ cleanbuildplace
 log.i "Building the build environment"
 mkdir -p "$BUILDPLACE"
 if [ ! -d "$BUILDPLACE" ]; then
-    log "E: Could not make directory [$BUILDPLACE]"
+    log.e "Could not make directory [$BUILDPLACE]"
     exit 1
 fi
 
@@ -60,7 +60,7 @@ fi
 if which "${DEBOOTSTRAP}"; then
     : # debootstrap exists
 else
-    log "E: ${DEBOOTSTRAP} does not exist, install or change DEBOOTSTRAP option"
+    log.e "${DEBOOTSTRAP} does not exist, install or change DEBOOTSTRAP option"
     exit 1
 fi
 
@@ -75,7 +75,7 @@ if ! ( "${DEBOOTSTRAP}" \
     "$BUILDPLACE" \
     "$MIRRORSITE" \
     $DEBOOTSTRAPSCRIPT ) ; then
-    log "E: $DEBOOTSTRAP failed"
+    log.e "$DEBOOTSTRAP failed"
     exit 1
 fi
 
diff --git a/pbuilder-modules b/pbuilder-modules
index 43e147d..9b5819d 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -367,7 +367,7 @@ done
 ## function to clean subdirs, use instead of rm -r
 function clean_subdirectories () {
   if [ -z "$1" ]; then
-      log "E: Fatal internal error in clean_subdirectories"
+      log.e "Fatal internal error in clean_subdirectories"
       exit 1;
   fi
   if [ ! -d "$1" ]; then
@@ -398,7 +398,7 @@ function cleanbuildplace () {
             # $BUILDPLACE (no dirty double slashes for *us*), so it matches
             # what will be in the output of mount.
             if mount |grep -q -F " $(readlink -f "$BUILDPLACE")/"; then
-                log "E: Something is still mounted under ${BUILDPLACE}; unmount and remove ${BUILDPLACE} manually"
+                log.e "Something is still mounted under ${BUILDPLACE}; unmount and remove ${BUILDPLACE} manually"
             else
                 log.i "cleaning the build env "
                 clean_subdirectories "$BUILDPLACE"
@@ -426,7 +426,7 @@ function installaptlines (){
     log.i "Installing apt-lines"
     rm -f "$BUILDPLACE"/etc/apt/sources.list
     if [ -z "$DISTRIBUTION" ]; then
-        log "E: Distribution not specified, please specify"
+        log.e "Distribution not specified, please specify"
         exit 1
     fi
     if [ -n "$OTHERMIRROR" ]; then
@@ -491,16 +491,16 @@ function extractbuildplace () {
         cleanbuildplace
         log.i "Building the build Environment"
         if ! mkdir -p "$BUILDPLACE"; then
-            log "E: failed to build the directory to chroot"
+            log.e "failed to build the directory to chroot"
             exit 1
         fi
         log.i "extracting base tarball [${BASETGZ}]"
         if [ ! -f "$BASETGZ" ]; then
-            log "E: failed to find $BASETGZ, have you done <pbuilder create> to create your base tarball yet?"
+            log.e "failed to find $BASETGZ, have you done <pbuilder create> to create your base tarball yet?"
             exit 1
         fi
         if ! (cd "$BUILDPLACE" && tar -x --use-compress-program "$COMPRESSPROG" -p -f "$BASETGZ"); then
-            log "E: failed to extract $BASETGZ to $BUILDPLACE"
+            log.e "failed to extract $BASETGZ to $BUILDPLACE"
             exit 1
         fi
     fi
@@ -596,7 +596,7 @@ function create_basetgz() {
     # create base.tgz
     (
         if ! cd "$BUILDPLACE"; then
-            log "E: unexpected error in chdir to $BUILDPLACE"
+            log.e "unexpected error in chdir to $BUILDPLACE"
             exit 1;
         fi
         while test -f "${BASETGZ}.tmp"; do
@@ -608,7 +608,7 @@ function create_basetgz() {
         rm "$BUILDPLACE/tmp/buildd"
     fi
         if ! tar -c --use-compress-program "$COMPRESSPROG" -f "${BASETGZ}.tmp" ./* ; then
-            log "E: failed building base tarball"
+            log.e "failed building base tarball"
             rm -f "${BASETGZ}.tmp"
             exit 1;
         fi
@@ -620,7 +620,7 @@ function copyinputfile() {
     # copy files to inside chroot, copy all files specified by INPUTFILE[] parameter.
     TARGETDIR="$1"
     if [ -z "$TARGETDIR" ]; then
-        log "E: Unexpected error in copyinputfile"
+        log.e "Unexpected error in copyinputfile"
         exit 1x
     fi
     if [ -n "$INPUTFILE" ]; then
diff --git a/pbuilder-user-mode-linux b/pbuilder-user-mode-linux
index 1e940dc..67ac5fd 100755
--- a/pbuilder-user-mode-linux
+++ b/pbuilder-user-mode-linux
@@ -36,7 +36,7 @@ function usecow () {
     PBUILDER_COWFILENAME="${BUILDPLACE}/$$.cow"
     PBUILDER_COW="${PBUILDER_COWFILENAME},"
     if ! touch "${PBUILDER_COWFILENAME}"; then
-	log "E: Cannot write-access to the COW file, check buildplace"
+	log.e "Cannot write-access to the COW file, check buildplace"
 	exit 1;
     fi
     rm -f "${PBUILDER_COWFILENAME}"
diff --git a/pdebuild b/pdebuild
index c589de2..5c804e6 100644
--- a/pdebuild
+++ b/pdebuild
@@ -25,7 +25,7 @@ while ! test -d ./debian -o "$(pwd)" = "/" ; do
 done
 
 if test ! -d ./debian; then
-    log "E: Cannot find ./debian dir"
+    log.e "Cannot find ./debian dir"
     exit 1
 fi;
 
@@ -69,7 +69,7 @@ if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then
 	    conditional_cp_a "${files}" "${BUILDRESULT}" || true
         done
     else
-	log "E: BUILDRESULT=[$BUILDRESULT] is not a directory."
+	log.e "BUILDRESULT=[$BUILDRESULT] is not a directory."
 	exit 1
     fi
 else
@@ -101,7 +101,7 @@ if [ "${AUTO_DEBSIGN}" = "yes" ]; then
     elif [ -f "${BUILDRESULT}/${SOURCE_CHANGES}" ]; then
         DEBSIGN_PARAM[2]="${BUILDRESULT}/${SOURCE_CHANGES}"
     else
-        log "E: the .changes file can't be found, debsing not done"
+        log.e "the .changes file can't be found, debsing not done"
         exit 1
     fi
     debsign "${DEBSIGN_PARAM[@]}"
diff --git a/pdebuild-checkparams b/pdebuild-checkparams
index 885ed7a..4a4243e 100644
--- a/pdebuild-checkparams
+++ b/pdebuild-checkparams
@@ -47,7 +47,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--configfile)
 	    if [ ! -f "$2" ]; then
-		log "E: Config file $2 does not exist"
+		log.e "Config file $2 does not exist"
 		exit 1
 	    fi
 	    . "$2";
@@ -107,7 +107,7 @@ while [ -n "$1" ]; do
 	    break;
 	    ;;
 	--*)
-	    log "E: Unknown option [$1] was specified "
+	    log.e "Unknown option [$1] was specified "
 	    exit 1;
 	    ;;
 	*)
diff --git a/pdebuild-internal b/pdebuild-internal
index 7f61a66..562be0d 100644
--- a/pdebuild-internal
+++ b/pdebuild-internal
@@ -69,7 +69,7 @@ while [ -n "$1" ]; do
 	    shift;
 	    ;;
 	--*)
-	    log "E: Unknown option [$1] was specified "
+	    log.e "Unknown option [$1] was specified "
 	    exit 1;
 	    ;;
 	*)