diff --git a/changelog.md b/changelog.md index 84074d1..821a922 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 0.2.3 + + * Change Brother printer driver/PPD + ## 0.2.2 * Update mimetype handling diff --git a/securedrop_export/VERSION b/securedrop_export/VERSION index ee1372d..7179039 100644 --- a/securedrop_export/VERSION +++ b/securedrop_export/VERSION @@ -1 +1 @@ -0.2.2 +0.2.3 diff --git a/securedrop_export/print/actions.py b/securedrop_export/print/actions.py index f0bc5ad..ae57cd0 100644 --- a/securedrop_export/print/actions.py +++ b/securedrop_export/print/actions.py @@ -10,8 +10,8 @@ PRINTER_NAME = "sdw-printer" PRINTER_WAIT_TIMEOUT = 60 -BRLASER_DRIVER = "/usr/share/cups/drv/brlaser.drv" -BRLASER_PPD = "/usr/share/cups/model/br7030.ppd" +BRLASER_DRIVER = "/usr/share/cups/drv/cupsfilters.drv" +BRLASER_PPD = "/usr/share/ppd/cupsfilters/pxlmono.ppd" LASERJET_DRIVER = "/usr/share/cups/drv/hpcups.drv" LASERJET_PPD = "/usr/share/cups/model/hp-laserjet_6l.ppd" diff --git a/tests/print/test_actions.py b/tests/print/test_actions.py index c500e8f..27dd8f9 100644 --- a/tests/print/test_actions.py +++ b/tests/print/test_actions.py @@ -86,7 +86,7 @@ def test_install_printer_ppd_brother(mocker): submission = export.SDExport("testfile", TEST_CONFIG) action = PrintExportAction(submission) ppd = action.install_printer_ppd("usb://Brother/HL-L2320D%20series?serial=A00000A000000") - assert ppd == "/usr/share/cups/model/br7030.ppd" + assert ppd == "/usr/share/ppd/cupsfilters/pxlmono.ppd" def test_install_printer_ppd_error_no_driver(mocker):