From 1a0c3a1ef083de2e01f49004cab6911596818523 Mon Sep 17 00:00:00 2001
From: Carlos Nihelton <carlos.santanadeoliveira@canonical.com>
Date: Mon, 1 Nov 2021 16:20:24 -0300
Subject: [PATCH] Prefill file checks summarized by os.path.isfile.

---
 system_setup/cmd/server.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/system_setup/cmd/server.py b/system_setup/cmd/server.py
index 4845f1a7..15f15fe0 100644
--- a/system_setup/cmd/server.py
+++ b/system_setup/cmd/server.py
@@ -15,7 +15,6 @@
 
 import argparse
 import logging
-import stat
 import os
 import sys
 
@@ -81,18 +80,10 @@ def main():
 
     prefillFile = opts.prefill
     if prefillFile:
-        if os.path.exists(prefillFile):
-            statInfo = os.stat(prefillFile)
-            mode = statInfo.st_mode
-            isRegularFile = (stat.S_ISREG(mode) != 0)
-            if not isRegularFile:
-                logger.error('"{}" is not a regular file.'
-                             ' Option will be ignored.'.format(prefillFile))
-                opts.prefill = None
-        else:
+        if not os.path.isfile(prefillFile):
+            logger.error('"File {}" is invalid. Option will be ignored.'
+                         .format(prefillFile))
             opts.prefill = None
-            logger.error('Prefill file "{}" does not exist.'
-                         ' Option will be ignored.'.format(prefillFile))
 
     server = SystemSetupServer(opts, block_log_dir)