jmr wrote:
> Michal has respun his webrev without the actions:__init__.py revert to
> r590 as well, to give us both options.
>
> With __init__.py from the trunk:
> http://cr.opensolaris.org/~migi/23_10_2008_bug_4116_v1_no_init/
>
> With __init__.py from rev590:
> http://cr.opensolaris.org/~migi/23_10_2008_bug_4116_v1/
Earlier today, it occurred to me that we know which pkg client is
currently using the API via history. As such, rather than add a
temporary flag to the api to control cache usage, unintentionally
exposing it, it makes more sense to just limit the caching to the cli as
a temporary workaround instead.
To do this, I would remove all of the use_cache changes you've made and
make the following simple changes to modules/client/image.py:
diff -r c95448e970e5 src/modules/client/image.py
--- a/src/modules/client/image.py Fri Oct 24 15:36:26 2008 -0500
+++ b/src/modules/client/image.py Fri Oct 24 15:42:28 2008 -0500
@@ -935,11 +935,14 @@
"""Find on-disk manifest and create in-memory Manifest
object, applying appropriate filters as needed."""
- if fmri in self.__manifest_cache:
- m = self.__manifest_cache[fmri]
+ if self.history.client_name == "pkg":
+ if fmri in self.__manifest_cache:
+ m = self.__manifest_cache[fmri]
+ else:
+ m = self.__get_manifest(fmri)
+ self.__manifest_cache[fmri] = m
else:
m = self.__get_manifest(fmri)
- self.__manifest_cache[fmri] = m
self.__touch_manifest(fmri)
==========================
The above change is only intended to be temporary, and a bug would need
to be filed to address the real issue. However, this to me, is far
simpler and preferable to adding a use_cache flag which also bumps the
API version and so on.
Code Review follows:
src/packagemanager.py:
line 40: s/lenght/length/
lines 580, 992-994: Suggested word change s/Fetching/Retrieving/
line 1112: tue users? what's that?
Otherwise, looks fine.
Cheers,
--
Shawn Walker
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
