Skip to content
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.

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

Dont hard fail when adding duplicate adlists #1449

Merged
merged 1 commit into from Jun 7, 2020

Conversation

PromoFaux
Copy link
Member

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

This is a workaround for now. Simply put, if a user enters a list into the input box that is already in their adlist table, then it is simply ignored so that the rest of the lists are still processed.

This can likely be cleared up in future to be a bit more intelligent (i.e feedback to the user that they have attempted to add a duplicate list) but for the time being this is sufficient.

… workaround for now

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux added this to the v5.1 milestone Jun 6, 2020
@PromoFaux PromoFaux requested a review from DL6ER June 6, 2020 17:29
@PromoFaux PromoFaux merged commit 228ea0a into devel Jun 7, 2020
@PromoFaux PromoFaux deleted the dont-fallover-on-duplicates branch June 7, 2020 09:25
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/error-when-adding-new-entry-to-adlist-unless-i-remove-http-s/30354/7

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/keine-neue-listen-moglich/38068/15

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/is-there-a-limit-for-the-number-of-adlists/51420/12

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants