normalize some tabs to 4 spaces and correct some indentation

Gbp-Dch: Ignore

2 files changed, 81 insertions, 81 deletions

diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 19852eb..4f0078c 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -46,23 +46,23 @@ function checkbuilddep () {
     # call satisfydepends
     local BUILDOPT="--binary-all"
     case "${BINARY_ARCH}" in
-	yes) BUILDOPT="--binary-arch";;
-	*) ;;
+        yes) BUILDOPT="--binary-arch";;
+        *) ;;
     esac
     if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" "${PBUILDERSATISFYDEPENDSOPT[@]}"; then
-	:
+        :
     else
-    # If asked to preserve the build place, and pbuilder-satisfydepends
-    # didn't taint it, then don't clean it when exiting.
-	if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then
-	    trap umountproc_trap exit sighup
-	fi
-	log "E: pbuilder-satisfydepends failed."
-	exit 2
+        # If asked to preserve the build place, and pbuilder-satisfydepends
+        # didn't taint it, then don't clean it when exiting.
+        if [ $? -eq 2 -a "${PRESERVE_BUILDPLACE}" = "yes" ]; then
+            trap umountproc_trap exit sighup
+        fi
+        log "E: pbuilder-satisfydepends failed."
+        exit 2
     fi
     # install extra packages to the chroot
     if [ -n "$EXTRAPACKAGES" ]; then 
-	$CHROOTEXEC usr/bin/apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES}
+        $CHROOTEXEC usr/bin/apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES}
     fi
 }
 
@@ -76,39 +76,39 @@ function cowprotect () {
     # a hack for cowdancer, used when a file is edited in-place;
     # Copy the file to create a new i-node so that hardlinked original is intact
     for A in "$@"; do
-	if readlink -f "$A" > /dev/null; then
-	    A=$(readlink -f "$A")
-	    mv "$A" "$A"~
-	    cp -a "$A"~ "$A"
-	    rm -f "$A"~
-	fi
+        if readlink -f "$A" > /dev/null; then
+            A=$(readlink -f "$A")
+            mv "$A" "$A"~
+            cp -a "$A"~ "$A"
+            rm -f "$A"~
+        fi
     done
 }
 
 function createbuilduser () {
     # create the build user, if it is necessary and specified.
     if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
-	if [ -e $BUILDPLACE/etc/shadow ]; then p='x'; else p='*'; fi
-	if [ -e $BUILDPLACE/etc/gshadow ]; then g='x'; else g='*'; fi
-	if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then
-	    cowprotect $BUILDPLACE/etc/passwd
-	    echo "$BUILDUSERNAME:$p:$BUILDUSERID:$BUILDUSERID:,,,:$BUILDDIR:/bin/sh" >> $BUILDPLACE/etc/passwd
-	fi
-	if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/group; then
-	    cowprotect $BUILDPLACE/etc/group
-	    echo "$BUILDUSERNAME:$g:$BUILDUSERID:" >> $BUILDPLACE/etc/group
-	fi
-	if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then
-	    cowprotect $BUILDPLACE/etc/shadow
-	    echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow
-	fi
-	if [ -e $BUILDPLACE/etc/gshadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/gshadow; then
-	    cowprotect $BUILDPLACE/etc/gshadow
-	    echo "$BUILDUSERNAME:!::" >> $BUILDPLACE/etc/gshadow
-	fi
-	unset LOGNAME || true
+        if [ -e $BUILDPLACE/etc/shadow ]; then p='x'; else p='*'; fi
+        if [ -e $BUILDPLACE/etc/gshadow ]; then g='x'; else g='*'; fi
+        if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then
+            cowprotect $BUILDPLACE/etc/passwd
+            echo "$BUILDUSERNAME:$p:$BUILDUSERID:$BUILDUSERID:,,,:$BUILDDIR:/bin/sh" >> $BUILDPLACE/etc/passwd
+        fi
+        if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/group; then
+            cowprotect $BUILDPLACE/etc/group
+            echo "$BUILDUSERNAME:$g:$BUILDUSERID:" >> $BUILDPLACE/etc/group
+        fi
+        if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then
+            cowprotect $BUILDPLACE/etc/shadow
+            echo "$BUILDUSERNAME:!:::::::" >> $BUILDPLACE/etc/shadow
+        fi
+        if [ -e $BUILDPLACE/etc/gshadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/gshadow; then
+            cowprotect $BUILDPLACE/etc/gshadow
+            echo "$BUILDUSERNAME:!::" >> $BUILDPLACE/etc/gshadow
+        fi
+        unset LOGNAME || true
     else
-	unset LOGNAME || true
+        unset LOGNAME || true
     fi
 }
 
@@ -119,7 +119,7 @@ function setup_ccache() {
             mkdir -p "$BUILDPLACE/$CCACHEDIR"
         fi
         chown -R $BUILDUSERID:$BUILDUSERID "$BUILDPLACE/$CCACHEDIR"
-	CCACHE_ENV="CCACHE_DIR=$CCACHEDIR"
-	unset CCACHE_DIR
+        CCACHE_ENV="CCACHE_DIR=$CCACHEDIR"
+        unset CCACHE_DIR
     fi
 }
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index da226a1..12ae25a 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -21,13 +21,13 @@
 
 
 package_versions() {
-	local PACKAGE="$1"
-	LC_ALL=C $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" | sed -n 's/^Version: //p'
+    local PACKAGE="$1"
+    LC_ALL=C $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" | sed -n 's/^Version: //p'
 }
 
 candidate_version() {
-	local PACKAGE="$1"
-	LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: //p'
+    local PACKAGE="$1"
+    LC_ALL=C $CHROOTEXEC apt-cache policy "$PACKAGE" | sed -n 's/ *Candidate: //p'
 }
 
 checkbuilddep_versiondeps() {
@@ -37,13 +37,13 @@ checkbuilddep_versiondeps() {
     local PACKAGEVERSIONS=$( package_versions "$PACKAGE" | xargs)
     # no versioned provides.
     if [ "${FORCEVERSION}" = "yes" ]; then
-	return 0;
+        return 0;
     fi
     for PACKAGEVERSION in $PACKAGEVERSIONS ; do
-      if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then
-	# satisfies depends
-	return 0;
-      fi
+        if dpkg --compare-versions "$PACKAGEVERSION" "$COMPARESTRING" "$DEPSVERSION"; then
+            # satisfies depends
+            return 0;
+        fi
     done
     echo "      Tried versions: $PACKAGEVERSIONS"
     # cannot satisfy depends
@@ -274,49 +274,49 @@ checkbuilddep_provides() {
     local PACKAGENAME="$1"
     # PROVIDED needs to be used outside of this function.
     PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg $PACKAGENAME \
-	| awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
+        | awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
 }
 
 # returns either "package=version", to append to an apt-get install line, or
 # package
 versioneddep_to_aptcmd() {
-	local INSTALLPKG="$1"
+    local INSTALLPKG="$1"
 
-	local PACKAGE
-	local PACKAGE_WITHVERSION
-	local PACKAGEVERSIONS
-	local CANDIDATE_VERSION
-	local COMPARESTRING
-	local DEPSVERSION
+    local PACKAGE
+    local PACKAGE_WITHVERSION
+    local PACKAGEVERSIONS
+    local CANDIDATE_VERSION
+    local COMPARESTRING
+    local DEPSVERSION
 
-	PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')"
-	PACKAGE_WITHVERSION="$PACKAGE"
+    PACKAGE="$(echo "$INSTALLPKG" | sed -e 's/^[/]*//' -e 's/[[/(].*//')"
+    PACKAGE_WITHVERSION="$PACKAGE"
 
-	# if not versionned, we skip directly to outputting $PACKAGE
-	if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then
-	    # package versions returned by APT, in reversed order
-	    PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )"
-	    CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )"
+    # if not versionned, we skip directly to outputting $PACKAGE
+    if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then
+        # package versions returned by APT, in reversed order
+        PACKAGEVERSIONS="$( package_versions "$PACKAGE" | tac | xargs )"
+        CANDIDATE_VERSION="$( candidate_version "$PACKAGE" )"
 
-	    COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/')"
-	    DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/')"
-	    # if strictly versionned, we skip to outputting that version
-	    if [ "=" = "$COMPARESTRING" ]; then
-		PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION"
-	    else
-		# try the candidate version, then all available versions (asc)
-		for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
-		    if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
-			if [ $VERSION != $CANDIDATE_VERSION ]; then
-			    PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
-			fi
-			break;
-		    fi
-		done
-	    fi
-	fi
+        COMPARESTRING="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\1/')"
+        DEPSVERSION="$(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*( *\(<<\|<=\|>=\|=\|<\|>>\|>\) *\(.*\)).*$/\2/')"
+        # if strictly versionned, we skip to outputting that version
+        if [ "=" = "$COMPARESTRING" ]; then
+            PACKAGE_WITHVERSION="$PACKAGE=$DEPSVERSION"
+        else
+            # try the candidate version, then all available versions (asc)
+            for VERSION in $CANDIDATE_VERSION $PACKAGEVERSIONS; do
+                if dpkg --compare-versions "$VERSION" "$COMPARESTRING" "$DEPSVERSION"; then
+                    if [ $VERSION != $CANDIDATE_VERSION ]; then
+                        PACKAGE_WITHVERSION="$PACKAGE=$VERSION"
+                    fi
+                    break;
+                fi
+            done
+        fi
+    fi
 
-	echo "$PACKAGE_WITHVERSION"
+    echo "$PACKAGE_WITHVERSION"
 }
 
 print_help() {