summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2013-01-04 23:02:26 +0000
committerRoger Leigh <rleigh@debian.org>2013-01-05 00:06:39 +0000
commita98b7ebd60032800901163fac9228721868157f8 (patch)
tree4c63c701a5ed6e1da0cd1bce130bdaa606dd2d8c /debian
parent883f5504e19302a51d474a94efebc3bb7f824ac4 (diff)
downloadschroot-a98b7ebd60032800901163fac9228721868157f8.tar.gz
Replace tabs with spaces in all source code
Diffstat (limited to 'debian')
-rw-r--r--debian/copyright4
-rw-r--r--debian/dchroot-dsa.preinst22
-rw-r--r--debian/dchroot.preinst24
-rwxr-xr-xdebian/schroot.init46
-rw-r--r--debian/schroot.postinst16
-rw-r--r--debian/schroot.postrm36
6 files changed, 74 insertions, 74 deletions
diff --git a/debian/copyright b/debian/copyright
index 730514f1..02f40241 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,8 +12,8 @@ Upstream Authors: Roger Leigh - Architecture, Coding, Documentation.
Kees Cook - 15killprocs and schroot-mount improvements
Copyright: © 2005-2008 Roger Leigh <rleigh@debian.org>
- © 2006 Andreas Bombe <aeb@debian.org>
- © 2007-2008 Kees Cook <kees@outflux.net>
+ © 2006 Andreas Bombe <aeb@debian.org>
+ © 2007-2008 Kees Cook <kees@outflux.net>
All program code, manuals, and documentation are licensed under the
terms of the GNU General Public License, version 3 or later:
diff --git a/debian/dchroot-dsa.preinst b/debian/dchroot-dsa.preinst
index 68a41334..998f30d3 100644
--- a/debian/dchroot-dsa.preinst
+++ b/debian/dchroot-dsa.preinst
@@ -18,17 +18,17 @@ set -e
case "$1" in
install|upgrade)
if dpkg --compare-versions "$2" lt "1.5.1"; then
- if [ -f /etc/dchroot.conf ]; then
- if [ -x /usr/bin/dchroot ]; then
- :
- elif [ -x /usr/bin/dchroot-dsa ]; then
- echo "Converting old dchroot-dsa configuration to schroot.conf format..."
- tmpfile=$(tempfile -d/etc/schroot/chroot.d -pconv- -s-dchroot-dsa)
- echo "/etc/dchroot.conf written to $tmpfile; please add appropriate access permissions"
- dchroot-dsa --config >> "$tmpfile"
- fi
- fi
- fi
+ if [ -f /etc/dchroot.conf ]; then
+ if [ -x /usr/bin/dchroot ]; then
+ :
+ elif [ -x /usr/bin/dchroot-dsa ]; then
+ echo "Converting old dchroot-dsa configuration to schroot.conf format..."
+ tmpfile=$(tempfile -d/etc/schroot/chroot.d -pconv- -s-dchroot-dsa)
+ echo "/etc/dchroot.conf written to $tmpfile; please add appropriate access permissions"
+ dchroot-dsa --config >> "$tmpfile"
+ fi
+ fi
+ fi
;;
abort-upgrade)
diff --git a/debian/dchroot.preinst b/debian/dchroot.preinst
index 8de5c306..2410eea9 100644
--- a/debian/dchroot.preinst
+++ b/debian/dchroot.preinst
@@ -18,24 +18,24 @@ set -e
case "$1" in
install|upgrade)
if dpkg --compare-versions "$2" lt "1.5.1"; then
- if [ -f /etc/dchroot.conf ]; then
- if [ -x /usr/bin/dchroot ]; then
- echo "Converting old dchroot configuration to schroot.conf format..."
- tmpfile=$(tempfile -d/etc/schroot/chroot.d -pconv- -s-dchroot)
- echo "/etc/dchroot.conf written to $tmpfile; please add appropriate access permissions"
- dchroot --config >> "$tmpfile"
- fi
- fi
- fi
- ;;
+ if [ -f /etc/dchroot.conf ]; then
+ if [ -x /usr/bin/dchroot ]; then
+ echo "Converting old dchroot configuration to schroot.conf format..."
+ tmpfile=$(tempfile -d/etc/schroot/chroot.d -pconv- -s-dchroot)
+ echo "/etc/dchroot.conf written to $tmpfile; please add appropriate access permissions"
+ dchroot --config >> "$tmpfile"
+ fi
+ fi
+ fi
+ ;;
abort-upgrade)
- ;;
+ ;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff --git a/debian/schroot.init b/debian/schroot.init
index ccf1d807..44def578 100755
--- a/debian/schroot.init
+++ b/debian/schroot.init
@@ -70,38 +70,38 @@ end_sessions()
case "$1" in
start|restart|force-reload)
- # Delete /var/lock/schroot if it's not root:root 0700, or if
- # it's not a directory.
- if [ -e /var/lock/schroot ]; then
- if [ "$(stat -c "%u %g %a" /var/lock/schroot)" != "0 0 700" ]; then
- rm -rf /var/lock/schroot
- fi
- if [ ! -d /var/lock/schroot ]; then
- rm -rf /var/lock/schroot
- fi
- fi
- if [ ! -d /var/lock/schroot ]; then
- mkdir -m 0700 /var/lock/schroot
- fi
+ # Delete /var/lock/schroot if it's not root:root 0700, or if
+ # it's not a directory.
+ if [ -e /var/lock/schroot ]; then
+ if [ "$(stat -c "%u %g %a" /var/lock/schroot)" != "0 0 700" ]; then
+ rm -rf /var/lock/schroot
+ fi
+ if [ ! -d /var/lock/schroot ]; then
+ rm -rf /var/lock/schroot
+ fi
+ fi
+ if [ ! -d /var/lock/schroot ]; then
+ mkdir -m 0700 /var/lock/schroot
+ fi
if [ "$START_ACTION" = "end" ] || [ "$SESSIONS_RECOVER" = "end" ] ; then
end_sessions
- else
+ else
recover_sessions
- fi
- ;;
+ fi
+ ;;
stop)
if [ "$STOP_ACTION" = "end" ] ; then
end_sessions
- fi
- ;;
+ fi
+ ;;
status)
- ;;
+ ;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
esac
exit 0
diff --git a/debian/schroot.postinst b/debian/schroot.postinst
index f8380436..70c88458 100644
--- a/debian/schroot.postinst
+++ b/debian/schroot.postinst
@@ -36,22 +36,22 @@ mv_conffile() {
# This is needed in order to migrate from using rcS to standard runlevels.
if dpkg --compare-versions "$2" lt "1.6.0-1"; then
- update-rc.d -f schroot remove >/dev/null
+ update-rc.d -f schroot remove >/dev/null
fi
if dpkg --compare-versions "$2" lt "1.6.4-1"; then
# Delete /var/lock/schroot if it's not root:root 0700, or if
# it's not a directory.
if [ -e /var/lock/schroot ]; then
- if [ "$(stat -c "%u %g %a" /var/lock/schroot)" != "0 0 700" ]; then
- rm -rf /var/lock/schroot
- fi
- if [ ! -d /var/lock/schroot ]; then
- rm -rf /var/lock/schroot
- fi
+ if [ "$(stat -c "%u %g %a" /var/lock/schroot)" != "0 0 700" ]; then
+ rm -rf /var/lock/schroot
+ fi
+ if [ ! -d /var/lock/schroot ]; then
+ rm -rf /var/lock/schroot
+ fi
fi
if [ ! -d /var/lock/schroot ]; then
- mkdir -m 0700 /var/lock/schroot
+ mkdir -m 0700 /var/lock/schroot
fi
fi
diff --git a/debian/schroot.postrm b/debian/schroot.postrm
index 52124953..f4a81e46 100644
--- a/debian/schroot.postrm
+++ b/debian/schroot.postrm
@@ -26,34 +26,34 @@ rm_conffile() {
local delete; delete="false"
if [ -f "$CONFFILE" ]; then
- local fpkg; fpkg=""
- local pkg; pkg=""
- if fpkg=$(dpkg -S "$CONFFILE" 2>/dev/null); then
- # Don't delete, but check which package it came from.
- pkg=$(echo $fpkg | sed -e 's/\(^[[:print:]][[:print:]]*\): .*$/\1/')
- if [ "$pkg" = "$PACKAGE" ]; then
- delete="true"
- fi
- else
- rm -f "$CONFFILE"
- delete="true"
- fi
+ local fpkg; fpkg=""
+ local pkg; pkg=""
+ if fpkg=$(dpkg -S "$CONFFILE" 2>/dev/null); then
+ # Don't delete, but check which package it came from.
+ pkg=$(echo $fpkg | sed -e 's/\(^[[:print:]][[:print:]]*\): .*$/\1/')
+ if [ "$pkg" = "$PACKAGE" ]; then
+ delete="true"
+ fi
+ else
+ rm -f "$CONFFILE"
+ delete="true"
+ fi
else
- delete="true"
+ delete="true"
fi
# Remove dpkg cruft
if [ "$delete" = "true" ]; then
- rm -f "${CONFFILE}.dpkg-old"
- rm -f "${CONFFILE}.dpkg-new"
- rm -f "${CONFFILE}.dpkg-dist"
+ rm -f "${CONFFILE}.dpkg-old"
+ rm -f "${CONFFILE}.dpkg-new"
+ rm -f "${CONFFILE}.dpkg-dist"
fi
}
case "$1" in
upgrade|failed-upgrade|abort-install|abort-upgrade)
- ;;
+ ;;
remove)
;;
@@ -66,7 +66,7 @@ case "$1" in
echo "postrm called with unknown argument \`$1'" >&2
exit 0
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically