Charm Helpers

Merge lp:~stub/charm-helpers/shush-apt into lp:charm-helpers

  1. shush-apt
  2. Merge into devel
Proposed by Stuart Bishop
Status: Merged
Merged at revision: 608
Proposed branch: lp:~stub/charm-helpers/shush-apt
Merge into: lp:charm-helpers
Diff against target: 33 lines (+3/-3)
2 files modified
charmhelpers/fetch/__init__.py (+2/-2)
tests/fetch/test_fetch.py (+1/-1)
To merge this branch: bzr merge lp:~stub/charm-helpers/shush-apt
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+300055@code.launchpad.net

Description of the change

charmhelpers.fetch.apt_cache() spams logs. Stop it by default.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

+1 much needed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/fetch/__init__.py'
2--- charmhelpers/fetch/__init__.py 2016-07-06 14:41:05 +0000
3+++ charmhelpers/fetch/__init__.py 2016-07-14 10:24:37 +0000
4@@ -178,14 +178,14 @@
5 return _pkgs
6
7
8-def apt_cache(in_memory=True):
9+def apt_cache(in_memory=True, progress=None):
10 """Build and return an apt cache"""
11 from apt import apt_pkg
12 apt_pkg.init()
13 if in_memory:
14 apt_pkg.config.set("Dir::Cache::pkgcache", "")
15 apt_pkg.config.set("Dir::Cache::srcpkgcache", "")
16- return apt_pkg.Cache()
17+ return apt_pkg.Cache(progress)
18
19
20 def apt_install(packages, options=None, fatal=False):
21
22=== modified file 'tests/fetch/test_fetch.py'
23--- tests/fetch/test_fetch.py 2015-12-09 23:06:09 +0000
24+++ tests/fetch/test_fetch.py 2016-07-14 10:24:37 +0000
25@@ -31,7 +31,7 @@
26 }
27
28
29-def fake_apt_cache():
30+def fake_apt_cache(in_memory=True, progress=None):
31 def _get(package):
32 pkg = MagicMock()
33 if package not in FAKE_APT_CACHE:

Subscribers

People subscribed via source and target branches