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.

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

Improve load_config_once_with_permission documentation #376

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Improve load_config_once_with_permission documentation #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2c7146
Improve load_config_once_with_permission documentation
planthaber Jul 13, 2022
b252d36
Fix rubocop error
planthaber Jul 15, 2022
a00f603
Update .rubocop.yml
planthaber Jul 15, 2022
74edf3e
Update .rubocop.yml
planthaber Jul 15, 2022
9049b54
Update .rubocop.yml
planthaber Jul 15, 2022
361d2d9
Update .rubocop.yml
planthaber Jul 15, 2022
6fccb2d
Update os_package_installer.rb
planthaber Jul 15, 2022
271f3ea
Update os_package_installer.rb
planthaber Jul 15, 2022
887b1e6
resolve rubocop:disable Lint/EmptyWhen by calling "nil"
planthaber Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Metrics/ParameterLists:
Naming/MethodParameterName:
AllowedNames: [io, id, to, by, on, in, at, ip, db, ws]

Gemspec/DateAssignment: # new in 1.10
Enabled: true
Layout/LineEndStringConcatenationIndentation: # new in 1.18
Enabled: true
Layout/SpaceBeforeBrackets: # new in 1.7
Expand Down
3 changes: 1 addition & 2 deletions lib/autoproj/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,8 +633,7 @@ def load_config_once_with_permission(filename, default: "yes", config_dir: Autop
declare "use_default_config_#{seed_config}",
"boolean",
default: default,
doc: ["Should the default workspace config be used?",
"This buildconf denines a default configuration in the buildconf (#{seed_config})",
doc: ["This buildconf defines a default workspace configuration (#{seed_config})",
"Should it be applied?"]
if get("use_default_config_#{seed_config}")
load_config_once(filename, config_dir: config_dir)
Expand Down
2 changes: 1 addition & 1 deletion lib/autoproj/os_package_installer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def osdeps_mode_string_to_value(string)
when "gem" then modes << "gem"
when "pip" then modes << "pip"
when "os" then modes << "os"
when "none" then # rubocop:disable Lint/EmptyWhen
when "none" then nil
else
if package_managers.key?(str)
modes << str
Expand Down