backend/satellite_tools/disk_dumper/dumper.py | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 816f19af7a5a2e6aca774a0cf96a7ff09a870221
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 3 15:38:34 2010 +0100
570176 - disable caching the channel info during export.
We shall no longer egnerate nor use channel cache files like
/var/cache/rhn/xml-channels/rhn-channel-101.xml as their content
is unreliable when --start-date / --end-date is used.
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 8377577..80573bd 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -1038,7 +1038,7 @@ class CachedDumper(exportLib.BaseDumper):
self.cache_set(params, s.getvalue())
-class ChannelsDumper(CachedDumper, exportLib.ChannelsDumper):
+class ChannelsDumper(exportLib.ChannelsDumper):
_query_list_channels = rhnSQL.Statement("""
select c.id, c.org_id,
c.label, ca.label channel_arch, c.basedir, c.name,
@@ -1054,20 +1054,22 @@ class ChannelsDumper(CachedDumper, exportLib.ChannelsDumper):
and c.checksum_type_id = ct.id (+)
""")
def __init__(self, writer, channels):
- h = rhnSQL.prepare(self._query_list_channels)
- CachedDumper.__init__(self, writer, statement=h, params=channels)
- self._writer = writer
+ exportLib.ChannelsDumper.__init__(self, writer, channels)
- def _get_key(self, params):
- channel_id = params['channel_id']
- return "xml-channels/rhn-channel-%d.xml" % channel_id
-
- def _dump_subelement(self, data):
+ def dump_subelement(self, data):
log_debug(6, data)
#return exportLib.ChannelsDumper.dump_subelement(self, data)
c = _ChannelsDumper(self._writer, data)
c.dump()
+ def set_iterator(self):
+ if not self._channels:
+ # Nothing to do
+ return
+
+ h = rhnSQL.prepare(self._query_list_channels)
+ return QueryIterator(statement=h, params=self._channels)
+
class _ChannelsDumper(exportLib._ChannelDumper):
tag_name = 'rhn-channel'
Show replies by date