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.

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

Fix default path fallack when core.sources:download_cache is not set #15109

Merged

Conversation

AbrilRBS
Copy link
Member

@AbrilRBS AbrilRBS commented Nov 15, 2023

Changelog: Bugfix: Fix backup sources error when no core.sources:download_cache is set.
Docs: Omit

The tests were unfortunately not covering that case

Closes #15103

@AbrilRBS AbrilRBS added this to the 2.0.15 milestone Nov 15, 2023
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are broken, please have a look.
Thanks for the PR!

@@ -185,6 +185,15 @@ def source(self):
assert f"Sources for {self.file_server.fake_url}/internet/myfile.txt found in remote backup" in self.client.out
assert f"File {self.file_server.fake_url}/mycompanystorage/mycompanyfile.txt not found in {self.file_server.fake_url}/backups/" in self.client.out

# Ensure defaults backup folder works if nothing set in global.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I understand the comment, you say nothing in the global.conf, then define the global.conf? 😅

@@ -24,6 +24,7 @@ def __init__(self, conanfile):
self._cache = helpers.cache
self._output = conanfile.output
self._conanfile = conanfile
self._cache_folder = helpers.cache.cache_folder
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not using self._cache.cache_folder below?

@memsharded memsharded merged commit 889ffbc into conan-io:release/2.0 Nov 15, 2023
@AbrilRBS AbrilRBS deleted the rr/bugfix-download-sources-conf branch November 15, 2023 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] conan 2.0.14 regression on core.sources:download_urls
2 participants