Merge lp:~hloeung/ubuntu-repository-cache/squid-cache-dir-min into lp:ubuntu-repository-cache

Proposed by Haw Loeung
Status: Merged
Approved by: Colin Misare
Approved revision: 357
Merged at revision: 357
Proposed branch: lp:~hloeung/ubuntu-repository-cache/squid-cache-dir-min
Merge into: lp:ubuntu-repository-cache
Diff against target: 10 lines (+1/-1)
1 file modified
lib/ubuntu_repository_cache/squid.py (+1/-1)
To merge this branch: bzr merge lp:~hloeung/ubuntu-repository-cache/squid-cache-dir-min
Reviewer Review Type Date Requested Status
Colin Misare Approve
Canonical IS Reviewers Pending
Review via email: mp+427464@code.launchpad.net

Commit message

Ensure cache_dir has a minimum size - LP:1744220

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Colin Misare (cmisare) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 357

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/ubuntu_repository_cache/squid.py'
2--- lib/ubuntu_repository_cache/squid.py 2022-05-30 03:41:13 +0000
3+++ lib/ubuntu_repository_cache/squid.py 2022-07-26 23:55:37 +0000
4@@ -163,7 +163,7 @@
5 size = int(min(max_size, free))
6
7 max_size -= size
8- cache_str = ''.join((cache_str, 'cache_dir aufs {} {} 16 256\n'.format(path, size)))
9+ cache_str = ''.join((cache_str, 'cache_dir aufs {} {} 16 256\n'.format(path, min(size, 200))))
10 return cache_str
11
12

Subscribers

People subscribed via source and target branches