backend/satellite_tools/disk_dumper/iss.py | 2 +- backend/satellite_tools/xmlSource.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit cc7e231134009e7a502b3b00e9c6a2dab6f11f93 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Apr 29 17:00:14 2010 +0200
585233 - use log2stderr instead of the (debugging) print.
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index fb2a463..3359358 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -570,7 +570,7 @@ class Dumper(dumper.XML_Dumper): relative_filename = self.channel_comps[channel['channel_id']] full_filename = os.path.join(CFG.MOUNT_POINT, self.channel_comps[channel['channel_id']]) target_filename = self.fm.getChannelCompsFile(channel['label']) - print "Need to copy %s to %s" % ( full_filename, target_filename ) + log2stderr(3, "Need to copy %s to %s" % ( full_filename, target_filename ))
# the comps.xml file will get gzipped afterwards # but it's still faster to do hardlink first
commit 5e61058e49e3a24ac5912703af6d31d53a5e0340 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Apr 29 16:57:52 2010 +0200
585233 - fix the logic handling has_comps and missing comps_last_modified.
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py index 7064af0..1da46f2 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -470,7 +470,8 @@ class ChannelItem(BaseItem): BaseItem.populateFromElements(self, obj, elements) if obj['checksum_type'] == 'sha': obj['checksum_type'] = 'sha1' - if not obj.has_key('comps_last_modified') and obj.has_key('has_comps'): + if (not obj.has_key('comps_last_modified') or obj['comps_last_modified'] == None) \ + and (obj.has_key('has_comps') and obj['has_comps'] == 'True'): obj['comps_last_modified'] = obj['last_modified'] addItem(ChannelItem)