Skip to content
This repository was archived by the owner on Mar 10, 2026. It is now read-only.

Fix not-working cupsSNMPSupplies and cupsIPPSupplies settings via lpa…#5610

Closed
zdohnal wants to merge 2 commits into
apple:masterfrom
zdohnal:snmp-ipp-supplies
Closed

Fix not-working cupsSNMPSupplies and cupsIPPSupplies settings via lpa…#5610
zdohnal wants to merge 2 commits into
apple:masterfrom
zdohnal:snmp-ipp-supplies

Conversation

@zdohnal

@zdohnal zdohnal commented Jul 9, 2019

Copy link
Copy Markdown
Contributor

…dmin

Connected to issue #5609

@michaelrsweet michaelrsweet self-assigned this Jul 12, 2019
@michaelrsweet michaelrsweet added this to the CUPS 2.2.x Updates milestone Jul 12, 2019
@michaelrsweet

michaelrsweet commented Jul 12, 2019

Copy link
Copy Markdown
Contributor

Looks about right, will need to merge by hand however...

@zdohnal

zdohnal commented Jul 16, 2019

Copy link
Copy Markdown
Contributor Author

Oh, I missed the indentation - I hope I corrected it now, please correct me if I'm wrong.

@michaelrsweet

michaelrsweet commented Jul 16, 2019

Copy link
Copy Markdown
Contributor

Indentation looks fine, I just can't merge to multiple Git branches via pull requests. No biggy, this is a small change...

michaelrsweet added a commit that referenced this pull request Jul 16, 2019
@michaelrsweet
Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)
9539c53
@michaelrsweet

michaelrsweet commented Jul 16, 2019

Copy link
Copy Markdown
Contributor

Oh, and there were two other places where we needed to set ppdchanged to 1...

[master 9539c53] Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)

[branch-2.2 c507739] Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)

@michaelrsweet michaelrsweet mentioned this pull request Jul 16, 2019
Closed
@zdohnal

zdohnal commented Jul 16, 2019

Copy link
Copy Markdown
Contributor Author

Indentation looks fine, I just can't merge to multiple Git branches via pull requests. No biggy, this is a small change...

Can I do anything about it in the future?

Oh, and there were two other places where we needed to set ppdchanged to 1...

D'oh, I missed those two, thank you for checking!

[master 9539c53] Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)

[branch-2.2 c507739] Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)

Thank you for the fix!

michaelrsweet added a commit that referenced this pull request Jul 16, 2019
@michaelrsweet
Fix lpadmin with cupsIPPSupplies and cupsSNMPSupplies (Issue #5610)
c507739
@michaelrsweet

michaelrsweet commented Jul 16, 2019

Copy link
Copy Markdown
Contributor

@zdohnal Unfortunately, Github is all about merging to master. Until they add support for pull requests against alternate branches I'll just keep doing manual merges...

Most of these fixes are pretty small anythings, so it is no problem - the bulk of the work has already been done! :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@michaelrsweet michaelrsweet

Labels

priority-medium

Projects

None yet

Milestone

CUPS 2.2.x Updates

Development

Successfully merging this pull request may close these issues.

2 participants

@zdohnal @michaelrsweet