Changed URI variable match for usb device #2181
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
|
What is about pre-SP3? |
|
SP0, SP1, SP2 etc.. :) |
dgutu-suse
force-pushed
the
zypper_lr
branch
2 times, most recently
from
4823b84
to
1b40524
Compare
okurz
reviewed
Dec 6, 2016
| @@ -617,7 +617,8 @@ sub validate_repos { | |||
| $uri = "http[s]*://.*suse"; | |||
| } | |||
| elsif (get_var('USBBOOT')) { | |||
| $uri = "hd:///.*usbstick"; | |||
| $uri = "hd:///.*usb" if get_var('VERSION', '12-SP3'); | |||
| $uri = "hd:///.*usbstick" if !get_var('VERSION', '12-SP3'); #pre-SP3 check | |||
There was a problem hiding this comment.
that's not a good idea. Why shouldn't it apply for more recent versions? Probably you want to use utils::sle_version_at_least
|
How does it look now? |
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.
The URI for usb devices doesn't match anymore 'usbstick' on installation from usb.
Just removed the 'stick' part from the string.
Depends also on https://bugzilla.suse.com/show_bug.cgi?id=1012258
because the match need at least one enabled repo( usb source in our case).