Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions service/lib/agama/config_reader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def config_from_file(path = nil)
Config.from_file(path, logger)
end

# Return an arry with the different {Config} objects read from the different locations
# Return an array with the different {Config} objects read from the different locations
#
# TODO: handle precedence correctly
#
Expand All @@ -82,7 +82,7 @@ def configs
@configs
end

# Return a {Config} oject
# Return a {Config} object
# @return [Config] resultant Config after merging all the configurations
def config
config = configs.first || Config.new(nil, logger)
Expand All @@ -97,7 +97,7 @@ def config
# @param location [String] File location. It might be an URL-like string (e.g.,
# "http://example.net/example.yml").
# @param target [String] Path to copy the file to.
# @return [Boolean] Whether the file was sucessfully copied or not
# @return [Boolean] Whether the file was successfully copied or not
def copy_file(location, target)
url = Yast::URL.Parse(location)

Expand Down