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

admin: prevent setting of 'core.owner' setting #1587

Merged
merged 1 commit into from
May 8, 2019

Conversation

HumorBaby
Copy link
Contributor

The title says it all!

Hello, #1556! Here, have some merge conficts 😄

Fixes #1586

@HumorBaby HumorBaby requested a review from a team May 6, 2019 20:55
@HumorBaby HumorBaby added the Bugfix Generally, PRs that reference (and fix) one or more issue(s) label May 6, 2019
@HumorBaby HumorBaby added this to the 6.6.8 milestone May 6, 2019
@HumorBaby HumorBaby changed the base branch from master to 6.6.x May 6, 2019 20:55
Copy link
Member

@dgw dgw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. I look forward to our future discussion about a more general way to enforce this on the setting side, rather than in admin.py. 😸

Copy link
Contributor

@Exirel Exirel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good fix.

@HumorBaby HumorBaby force-pushed the 1586-block-set-core-owner branch from 908e4e0 to ad9f1c6 Compare May 7, 2019 11:42
@HumorBaby
Copy link
Contributor Author

Force pushed:

diff --git a/sopel/modules/admin.py b/sopel/modules/admin.py                     
index 6792b246..3191f891 100644                                                  
--- a/sopel/modules/admin.py                                                     
+++ b/sopel/modules/admin.py                                                     
@@ -220,7 +220,7 @@ def set_config(bot, trigger):                                
         bot.reply("%s.%s = %s" % (section_name, option, value))                 
         return                                                                  
                                                                                 
-    # 'core.owner` cannot be set by the bot. Any changes to this setting must be
+    # 'core.owner' cannot be set by the bot. Any changes to this setting must be
     # made manually in the config file.                                         
     if section_name == 'core' and option == 'owner':                            
         bot.say('\'core.owner\' cannot be set by the bot. '                     

@dgw dgw merged commit ad9f1c6 into sopel-irc:6.6.x May 8, 2019
dgw added a commit that referenced this pull request May 8, 2019
admin: prevent setting of 'core.owner' setting
@HumorBaby HumorBaby deleted the 1586-block-set-core-owner branch August 28, 2019 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix Generally, PRs that reference (and fix) one or more issue(s)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants