backend/satellite_tools/disk_dumper/iss.py | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit b27ece681b37f19b3b5a6e43cc2ead7c1807c972
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 24 13:46:04 2010 +0100
don't limit channel list on dates
there might be a valid data in the channel even if it was last synced
after end_time
diff --git a/backend/satellite_tools/disk_dumper/iss.py
b/backend/satellite_tools/disk_dumper/iss.py
index e8133bd..3d70abd 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -175,11 +175,6 @@ class Dumper(dumper.XML_Dumper):
from rhnChannel ch
where ch.label = :label
"""
- if self.start_date:
- query += """
- and last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
- """
self.channel_query = rhnSQL.Statement(query)
ch_data = rhnSQL.prepare(self.channel_query)
@@ -190,14 +185,11 @@ class Dumper(dumper.XML_Dumper):
#Channel_labels should be the list of channels passed into
rhn-satellite-exporter by the user.
log2stdout(1, "Gathering channel info...")
for ids in channel_labels:
- ch_data.execute(label=ids, **dates)
+ ch_data.execute(label=ids)
ch_info = ch_data.fetchall_dict()
if not ch_info:
- if self.start_date:
- raise ISSError("Error: No %s channel information found
within specified time frame." % ids, "")
- else:
- raise ISSError("Error: Channel %s not found." % ids,
"")
+ raise ISSError("Error: Channel %s not found." % ids,
"")
self.channel_ids = self.channel_ids + ch_info
Show replies by date