From 2243a276e4b84dedc8d362ad66716026688949c0 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Wed, 5 Apr 2017 22:20:01 +0200
Subject: [PATCH] makechrootpkg: Unindent as suggested in 2fd5931

---
 makechrootpkg.in | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index a8a71ec..f6764cb 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -112,27 +112,25 @@ sync_chroot() {
 		return 1
 	fi
 
-	if true; then # indent for rebasing/merging purposes
-		# Get a read lock on the root chroot to make
-		# sure we don't clone a half-updated chroot
-		slock 8 "$chrootdir/root.lock" \
-			"Locking clean chroot [%s]" "$chrootdir/root"
+	# Get a read lock on the root chroot to make
+	# sure we don't clone a half-updated chroot
+	slock 8 "$chrootdir/root.lock" \
+		"Locking clean chroot [%s]" "$chrootdir/root"
 
-		stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
-		if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
-			subvolume_delete_recursive "$copydir" ||
-				die "Unable to delete subvolume %s" "$copydir"
-			btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
-				die "Unable to create subvolume %s" "$copydir"
-		else
-			mkdir -p "$copydir"
-			rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
-		fi
-		stat_done
-
-		# Drop the read lock again
-		lock_close 8
+	stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copydir"
+	if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+		subvolume_delete_recursive "$copydir" ||
+			die "Unable to delete subvolume %s" "$copydir"
+		btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
+			die "Unable to create subvolume %s" "$copydir"
+	else
+		mkdir -p "$copydir"
+		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
 	fi
+	stat_done
+
+	# Drop the read lock again
+	lock_close 8
 
 	# Update mtime
 	touch "$copydir"