Merge lp:~le-chi-thu/lava-test/disable-file-cache into lp:lava-test/0.0

Proposed by Le Chi Thu
Status: Merged
Merged at revision: 88
Proposed branch: lp:~le-chi-thu/lava-test/disable-file-cache
Merge into: lp:lava-test/0.0
Diff against target: 16 lines (+5/-1)
1 file modified
abrek/cache.py (+5/-1)
To merge this branch: bzr merge lp:~le-chi-thu/lava-test/disable-file-cache
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+71766@code.launchpad.net

Description of the change

ChiThu> zyga, BTW the work around with the declare test in abrek is not using the file cache.
<ChiThu> zyga, can I make a mp with that workaround ?
<zyga> ChiThu, what is the workaround?
<zyga> ChiThu, I'm patching abrek, I will include your fix in my branch
<ChiThu> the problem when you specify an url not started with file://
<zyga> ah
<ChiThu> zyga, I sent you an email about that
<zyga> yeah I understand
<zyga> sorry, I'm heavily in the red with regards to my email backlog
<ChiThu> zyga, we need that workaround for the release this week.
<zyga> ChiThu, I understand

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

This can be merged now, we'll fix this with my rewrite branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'abrek/cache.py'
--- abrek/cache.py 2011-06-28 12:51:57 +0000
+++ abrek/cache.py 2011-08-16 19:22:23 +0000
@@ -56,7 +56,11 @@
56 Like urlopen.open() but the content may be cached.56 Like urlopen.open() but the content may be cached.
57 """57 """
58 # Do not cache local files, this is not what users would expect58 # Do not cache local files, this is not what users would expect
59 if url.startswith("file://"):59
60 # workaround - not using cache at all.
61 # TODO: fix this and use the cache
62 # if url.startswith("file://"):
63 if True:
60 stream = urllib2.urlopen(url)64 stream = urllib2.urlopen(url)
61 else:65 else:
62 key = self._key_for_url(url)66 key = self._key_for_url(url)

Subscribers

People subscribed via source and target branches