From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 5 May 2020 19:19:59 +0000 (+0100)
Subject: bin/chroot-maint: Fix mistakenly indented file-contents literals.
X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/commitdiff_plain/4bd9f538e3bbf0ea73c9b1cecf81d3a330dde238

bin/chroot-maint: Fix mistakenly indented file-contents literals.

Also, sneakily use a tab in the `apt.conf' file.
---

diff --git a/bin/chroot-maint b/bin/chroot-maint
index 6202f49..1d4a2a9 100755
--- a/bin/chroot-maint
+++ b/bin/chroot-maint
@@ -2156,12 +2156,12 @@ class ChrootJob (BaseJob):
         with safewrite_root\
              (OS.path.join(mnt, "fs/etc/apt/apt.conf.d/20arch")) as f:
           f.write("""\
-  ### -*-conf-*-
+### -*-conf-*-
 
-  APT {
-          Architecture "%s";
-  };
-  """ % arch)
+APT {
+	Architecture "%s";
+};
+""" % arch)
 
         ## Set up the locale and time zone from the host system.
         progress("configure locales and timezone")
@@ -2184,10 +2184,10 @@ class ChrootJob (BaseJob):
         with safewrite_root(OS.path.join(mnt, "fs/usr/sbin/policy-rc.d"),
                             mode = "755") as f:
           f.write("""\
-  #! /bin/sh
-  echo >&2 "policy-rc.d: Services disabled by policy."
-  exit 101
-  """)
+#! /bin/sh
+echo >&2 "policy-rc.d: Services disabled by policy."
+exit 101
+""")
 
         ## Hack the dynamic linker to prefer libraries in `/usr' over
         ## `/usr/local'.  This prevents `dpkg-shlibdeps' from becoming
@@ -2199,10 +2199,10 @@ class ChrootJob (BaseJob):
         with safewrite_root\
              (OS.path.join(mnt, "fs/etc/ld.so.conf.d/zzz-local.conf")) as f:
           f.write("""\
-  ### -*-conf-*-
-  ### Local hack to make /usr/local/ late.
-  /usr/local/lib
-  """)
+### -*-conf-*-
+### Local hack to make /usr/local/ late.
+/usr/local/lib
+""")
 
       ## If this is a foreign architecture then we need to set it up.
       if arch in C.FOREIGN_ARCHS: