lib/tools/ensure_dirs.py: Code formatting

Wrap lines in a consistent manner (uid/gid on the second line) if
wrapping is necessary at all. “git diff --color-words” shows no
difference at all as only whitespace changed.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/lib/tools/ensure_dirs.py b/lib/tools/ensure_dirs.py
index bb20e5d..8e72b0d 100644 (file)
--- a/lib/tools/ensure_dirs.py
+++ b/lib/tools/ensure_dirs.py
@@ -128,22 +128,21 @@ def GetPaths():
   master_cleaner_log_dir = os.path.join(pathutils.LOG_DIR, "master-cleaner")
 
   paths = [
-    (pathutils.DATA_DIR, DIR, 0755, getent.masterd_uid,
-     getent.masterd_gid),
+    (pathutils.DATA_DIR, DIR, 0755, getent.masterd_uid, getent.masterd_gid),
     (pathutils.CLUSTER_DOMAIN_SECRET_FILE, FILE, 0640,
      getent.masterd_uid, getent.masterd_gid, False),
-    (pathutils.CLUSTER_CONF_FILE, FILE, 0640, getent.masterd_uid,
-     getent.confd_gid, False),
-    (pathutils.CONFD_HMAC_KEY, FILE, 0440, getent.confd_uid,
-     getent.masterd_gid, False),
-    (pathutils.SSH_KNOWN_HOSTS_FILE, FILE, 0644, getent.masterd_uid,
-     getent.masterd_gid, False),
-    (pathutils.RAPI_CERT_FILE, FILE, 0440, getent.rapi_uid,
-     getent.masterd_gid, False),
-    (pathutils.SPICE_CERT_FILE, FILE, 0440, getent.noded_uid,
-     getent.masterd_gid, False),
-    (pathutils.SPICE_CACERT_FILE, FILE, 0440, getent.noded_uid,
-     getent.masterd_gid, False),
+    (pathutils.CLUSTER_CONF_FILE, FILE, 0640,
+     getent.masterd_uid, getent.confd_gid, False),
+    (pathutils.CONFD_HMAC_KEY, FILE, 0440,
+     getent.confd_uid, getent.masterd_gid, False),
+    (pathutils.SSH_KNOWN_HOSTS_FILE, FILE, 0644,
+     getent.masterd_uid, getent.masterd_gid, False),
+    (pathutils.RAPI_CERT_FILE, FILE, 0440,
+     getent.rapi_uid, getent.masterd_gid, False),
+    (pathutils.SPICE_CERT_FILE, FILE, 0440,
+     getent.noded_uid, getent.masterd_gid, False),
+    (pathutils.SPICE_CACERT_FILE, FILE, 0440,
+     getent.noded_uid, getent.masterd_gid, False),
     (pathutils.NODED_CERT_FILE, FILE, pathutils.NODED_CERT_MODE,
      getent.masterd_uid, getent.masterd_gid, False),
     ]
@@ -154,10 +153,9 @@ def GetPaths():
                   getent.noded_uid, getent.noded_gid, False))
 
   paths.extend([
-    (pathutils.QUEUE_DIR, DIR, 0700, getent.masterd_uid,
-     getent.masterd_gid),
-    (pathutils.QUEUE_DIR, QUEUE_DIR, 0600, getent.masterd_uid,
-     getent.masterd_gid),
+    (pathutils.QUEUE_DIR, DIR, 0700, getent.masterd_uid, getent.masterd_gid),
+    (pathutils.QUEUE_DIR, QUEUE_DIR, 0600,
+     getent.masterd_uid, getent.masterd_gid),
     (pathutils.JOB_QUEUE_LOCK_FILE, FILE, 0600,
      getent.masterd_uid, getent.masterd_gid, False),
     (pathutils.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
@@ -167,33 +165,28 @@ def GetPaths():
     (pathutils.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
      getent.masterd_uid, getent.masterd_gid),
     (rapi_dir, DIR, 0750, getent.rapi_uid, getent.masterd_gid),
-    (pathutils.RAPI_USERS_FILE, FILE, 0640, getent.rapi_uid,
-     getent.masterd_gid, False),
-    (pathutils.RUN_DIR, DIR, 0775, getent.masterd_uid,
-     getent.daemons_gid),
-    (pathutils.SOCKET_DIR, DIR, 0770, getent.masterd_uid,
-     getent.daemons_gid),
-    (pathutils.MASTER_SOCKET, FILE, 0660, getent.masterd_uid,
-     getent.daemons_gid, False),
-    (pathutils.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid,
-     getent.masterd_gid),
-    (pathutils.UIDPOOL_LOCKDIR, DIR, 0750, getent.noded_uid,
-     getent.masterd_gid),
-    (pathutils.DISK_LINKS_DIR, DIR, 0755, getent.noded_uid,
-     getent.masterd_gid),
-    (pathutils.CRYPTO_KEYS_DIR, DIR, 0700, getent.noded_uid,
-     getent.masterd_gid),
-    (pathutils.IMPORT_EXPORT_DIR, DIR, 0755, getent.noded_uid,
-     getent.masterd_gid),
-    (pathutils.LOG_DIR, DIR, 0770, getent.masterd_uid,
-     getent.daemons_gid),
-    (masterd_log, FILE, 0600, getent.masterd_uid, getent.masterd_gid,
-     False),
+    (pathutils.RAPI_USERS_FILE, FILE, 0640,
+     getent.rapi_uid, getent.masterd_gid, False),
+    (pathutils.RUN_DIR, DIR, 0775, getent.masterd_uid, getent.daemons_gid),
+    (pathutils.SOCKET_DIR, DIR, 0770, getent.masterd_uid, getent.daemons_gid),
+    (pathutils.MASTER_SOCKET, FILE, 0660,
+     getent.masterd_uid, getent.daemons_gid, False),
+    (pathutils.BDEV_CACHE_DIR, DIR, 0755,
+     getent.noded_uid, getent.masterd_gid),
+    (pathutils.UIDPOOL_LOCKDIR, DIR, 0750,
+     getent.noded_uid, getent.masterd_gid),
+    (pathutils.DISK_LINKS_DIR, DIR, 0755,
+     getent.noded_uid, getent.masterd_gid),
+    (pathutils.CRYPTO_KEYS_DIR, DIR, 0700,
+     getent.noded_uid, getent.masterd_gid),
+    (pathutils.IMPORT_EXPORT_DIR, DIR, 0755,
+     getent.noded_uid, getent.masterd_gid),
+    (pathutils.LOG_DIR, DIR, 0770, getent.masterd_uid, getent.daemons_gid),
+    (masterd_log, FILE, 0600, getent.masterd_uid, getent.masterd_gid, False),
     (confd_log, FILE, 0600, getent.confd_uid, getent.masterd_gid, False),
     (noded_log, FILE, 0600, getent.noded_uid, getent.masterd_gid, False),
     (rapi_log, FILE, 0600, getent.rapi_uid, getent.masterd_gid, False),
-    (pathutils.LOG_OS_DIR, DIR, 0750, getent.masterd_uid,
-     getent.daemons_gid),
+    (pathutils.LOG_OS_DIR, DIR, 0750, getent.masterd_uid, getent.daemons_gid),
     (cleaner_log_dir, DIR, 0750, getent.noded_uid, getent.noded_gid),
     (master_cleaner_log_dir, DIR, 0750, getent.masterd_uid, getent.masterd_gid),
     ])