Sle 15 sp1 bsc 1132915 #797
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the CD has already been mounted
wfeldt
reviewed
May 13, 2019
src/lib/transfer/file_from_url.rb
Outdated
| ) | ||
| if Installation.boot == "cd" && !cdrom_device.empty? | ||
| mtab = File.read("/proc/mounts") | ||
| if mtab.include?(cdrom_device) |
There was a problem hiding this comment.
Wouldn't a regexp that at least guarantees that mtab.split().find below finds something be better? include? does only a substring match and that could be anything.
wfeldt
reviewed
May 13, 2019
src/lib/transfer/file_from_url.rb
Outdated
| ) | ||
| if Installation.boot == "cd" && !cdrom_device.empty? | ||
| mtab = File.read("/proc/mounts") | ||
| if mtab.include?(cdrom_device) | ||
| Builtins.y2warning( |
There was a problem hiding this comment.
Not part of the patch, but anyway: why a warning? This is imho a normal situation - so y2milestone.
wfeldt
reviewed
May 14, 2019
src/lib/transfer/file_from_url.rb
Outdated
| Builtins.y2warning( | ||
| if Installation.boot == "cd" && !cdrom_device.empty? | ||
| mtab = File.read("/proc/mounts") | ||
| if mtab.match(Regexp.new("^#{cdrom_device}")) |
There was a problem hiding this comment.
I'd add at least a space: Regexp.new("^#{cdrom_device}\\s"). But why not simply
m = mtab.match(/^#{cdrom_device}\s+(\S+)/)
where m[1] then is the mountpoint and get rid of this split and find business?
|
changelog? - I found it :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Has also been tested by the reporter.