Merge pull request #52 from freedomofpress/check_drivers_already_inst…

…alled only install drivers if needed
freedomofpress · Jan 23, 2020 · 0f4cb03 · 0f4cb03
2 parents 11c6322 + a2c5917
commit 0f4cb03
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/securedrop_export/print/actions.py b/securedrop_export/print/actions.py
@@ -120,17 +120,19 @@ def install_printer_ppd(self, uri):
             printer_driver = LASERJET_DRIVER
             printer_ppd = LASERJET_PPD
 
-        # Some drivers don't come with ppd files pre-compiled, we must compile them
-        self.submission.safe_check_call(
-            command=[
-                "sudo",
-                "ppdc",
-                printer_driver,
-                "-d",
-                "/usr/share/cups/model/",
-            ],
-            error_message=ExportStatus.ERROR_PRINTER_DRIVER_UNAVAILABLE.value
-        )
+        # Compile and install drivers that are not already installed
+        if not os.path.exists(printer_ppd):
+            self.submission.safe_check_call(
+                command=[
+                    "sudo",
+                    "ppdc",
+                    printer_driver,
+                    "-d",
+                    "/usr/share/cups/model/",
+                ],
+                error_message=ExportStatus.ERROR_PRINTER_DRIVER_UNAVAILABLE.value
+            )
+
         return printer_ppd
 
     def setup_printer(self, printer_uri, printer_ppd):