Make printer instances work again #5679
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move the code to read dests from global and user lpoptions files to a separate function 'cups_get_dests_from_lpoptions'. This is to avoid duplication, in particular since the same functionality will be used again in a follow-up patch. Move the related comment in 'cups_enum_dests' to the place where the lpoptions files are actually evaluated.
... after commit c5f5c5a ("The `cupsEnumDests` function did not include options from the lpoptions files (Issue #5144)") had moved option reading to function 'cups_enum_dests'. Move the reading of dests after the call to '_cupsGetDests' and use 'dests' and 'num_dests' directly instead of 'data.dests' and 'data.num_dests', so that the printer instances and options from the lpoptions files are taken into account right away. Applying user options in an extra step is no longer necessary with this approach, so drop the corresponding loop. This makes printer instances work again for printers retrieved from the CUPS server. It leaves the DNSSD/Avahi case unchanged for now.
This was referenced Nov 11, 2019
|
Sorry, that change has some bad side-effects. I will push a simpler fix to cups_enum_dests against the parent bug... |
|
Fine for me, thanks for looking into it! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi Mike,
since commit c5f5c5a, printer instances don't work anymore.
They can be created, e.g. using
and then show up in
~/.cups/lpoptions. However, they are not listed when e.g. runninglpstat -vor in print dialogs.These two commits make printer instances work again for the case where queues from the local CUPS server are used.
Handling of instances for autodiscovered printers might need a follow-up commit. I wasn't 100 % sure about this, so left it unchanged.