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 config/cache dir compatibility issues, fixes #7445 #7448

Merged

Conversation

nain-F49FF806
Copy link
Contributor

@nain-F49FF806 nain-F49FF806 commented Mar 17, 2023

fixes #7445.

@nain-F49FF806 nain-F49FF806 changed the title WIP: Fixes config dir compatibility issue identified in #7445 WIP: Fixes config, cache dir compatibility issues identified in #7445 Mar 18, 2023
@nain-F49FF806 nain-F49FF806 marked this pull request as ready for review March 18, 2023 08:44
@codecov-commenter
Copy link

codecov-commenter commented Mar 18, 2023

Codecov Report

Merging #7448 (834641b) into master (1428ffe) will decrease coverage by 0.28%.
The diff coverage is n/a.

❗ Current head 834641b differs from pull request most recent head 6fb147c. Consider uploading reports for the commit 6fb147c to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master    #7448      +/-   ##
==========================================
- Coverage   83.87%   83.60%   -0.28%     
==========================================
  Files          67       67              
  Lines       11796    11796              
  Branches     2149     2012     -137     
==========================================
- Hits         9894     9862      -32     
- Misses       1329     1355      +26     
- Partials      573      579       +6     
Impacted Files Coverage Δ
src/borg/helpers/fs.py 82.90% <ø> (+1.70%) ⬆️

... and 7 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ThomasWaldmann ThomasWaldmann changed the title WIP: Fixes config, cache dir compatibility issues identified in #7445 fix config/cache dir compatibility issues, fixes #7445 Mar 20, 2023
src/borg/testsuite/helpers.py Outdated Show resolved Hide resolved
src/borg/testsuite/helpers.py Show resolved Hide resolved
src/borg/testsuite/helpers.py Outdated Show resolved Hide resolved
@nain-F49FF806 nain-F49FF806 force-pushed the fix-cache-config-dir-compat branch from 564713e to 9f113c3 Compare March 27, 2023 11:41
Make sure the result of get_cache_dir
matches pre and post borgbackup#7300 where desired
@nain-F49FF806 nain-F49FF806 force-pushed the fix-cache-config-dir-compat branch from 191da86 to 834641b Compare March 29, 2023 11:47
@nain-F49FF806 nain-F49FF806 force-pushed the fix-cache-config-dir-compat branch from 834641b to 6fb147c Compare March 29, 2023 12:46
Copy link
Member

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

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

LGTM!

@ThomasWaldmann ThomasWaldmann merged commit dfef2b9 into borgbackup:master Mar 29, 2023
@ThomasWaldmann
Copy link
Member

Thanks!

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.

wrong cache directories
3 participants