Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
zdohnal wants to merge 2 commits into from
Closed

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

zdohnal wants to merge 2 commits into from

Conversation

@zdohnal
Copy link
Contributor

@zdohnal zdohnal commented Jul 9, 2019

…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
Copy link
Collaborator

michaelrsweet commented Jul 12, 2019

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

@zdohnal
Copy link
Contributor Author

zdohnal commented Jul 16, 2019

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

@michaelrsweet
Copy link
Collaborator

michaelrsweet commented Jul 16, 2019

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
Copy link
Collaborator

michaelrsweet commented Jul 16, 2019

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
Copy link
Contributor Author

zdohnal commented Jul 16, 2019

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
Copy link
Collaborator

michaelrsweet commented Jul 16, 2019

@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 join this conversation on GitHub. Already have an account? Sign in to comment

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