Do not crash when the repository URL is not defined (bsc#1043218) #77
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
schubi2
reviewed
Jun 21, 2017
| @@ -267,8 +267,14 @@ PkgFunctions::SourceLoadImpl(PkgProgress &progress) | |||
| // do not autorefresh remote repositories when the network is not running | |||
| if (!network_is_running) | |||
| { | |||
| zypp::Url url = *((*it)->repoInfo().baseUrlsBegin()); | |||
|
|
|||
| if ((*it)->repoInfo().baseUrlsEmpty()) | |||
| zypp::Url url = *((*it)->repoInfo().baseUrlsBegin()); | ||
|
|
||
| if ((*it)->repoInfo().baseUrlsEmpty()) | ||
| { |
| @@ -286,11 +292,17 @@ PkgFunctions::SourceLoadImpl(PkgProgress &progress) | |||
| refresh_started_called = true; | |||
| } | |||
|
|
|||
| zypp::RepoManager::RefreshCheckStatus ref_stat = repomanager->checkIfToRefreshMetadata((*it)->repoInfo(), *((*it)->repoInfo().baseUrlsBegin())); | |||
| if ((*it)->repoInfo().baseUrlsEmpty()) | |||
|
|
||
| refresh = false; | ||
| } | ||
| if (repoinfo.baseUrlsEmpty()) |
| (*_repo.baseUrlsBegin()).asString().c_str()); | ||
| _maccess = new zypp::MediaSetAccess(_repo.name(), *_repo.baseUrlsBegin()); // FIXME handle multiple baseUrls | ||
| _repo.url().asString().c_str()); | ||
| _maccess = new zypp::MediaSetAccess(_repo.name(), _repo.url()); // FIXME handle multiple baseUrls |
There was a problem hiding this comment.
Um, I do not know so I keep it for now 😉
|
The indentation issues are caused by mixed spaces and tabs. GitHub does not display it correctly 😟 . In editor it looks OK. And I'd like to avoid complete reformatting the code. |
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.
Note
RepoInfo::url()is a shortcut forbaseUrlsEmpty() ? Url() : *baseUrlsBegin()), i.e. returns empty URL if the repo does not define it. This can simplify the code a bit, see the details here.