Order the check for len(self.opts)

rickysarraf · Jun 4, 2024 · dbcf7db · dbcf7db
1 parent 6325d7e
commit dbcf7db
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/apt_offline_core/AptOfflineCoreLib.py b/apt_offline_core/AptOfflineCoreLib.py
@@ -723,17 +723,19 @@ def __init__(self, gpgv=None, keyring=None, Simulate=False):
                         )
                         self.opts.extend(["--keyring", eachGPG])
 
-        if len(self.opts) == 1:
-            log.err(
-                "No valid keyring paths found in: %s\n"
-                % (", ".join(self.defaultPaths))
-            )
-
         if keyring:
             for eachFile in os.listdir(keyring):
                 extraKeyringFile = os.path.join(keyring, eachFile)
                 log.verbose("extraKeyringFile is %s" % extraKeyringFile)
-                self.opts.extend(["--keyring", extraKeyringFile, "--ignore-time-conflict"])
+                self.opts.extend(
+                    ["--keyring", extraKeyringFile, "--ignore-time-conflict"]
+                )
+
+        if len(self.opts) == 1:
+            log.err(
+                "No valid keyring paths found in: %s\n" % (
+                    ", ".join(self.defaultPaths))
+            )
 
     def DearmorSig(self, asciiSig):
         gpgCmd = []
@@ -2216,8 +2218,10 @@ def displayBugs(self, dataType=None):
                     sys.exit(1)
 
         def verifyAptFileIntegrity(self, FileList):
-            self.AptSecure = APTVerifySigs(keyring=InstallerInstance.extra_keyring,
-                Simulate=InstallerInstance.Bool_TestWindows)
+            self.AptSecure = APTVerifySigs(
+                keyring=InstallerInstance.extra_keyring,
+                Simulate=InstallerInstance.Bool_TestWindows,
+            )
 
             self.lFileList = FileList
             self.lFileList.sort()