backend/rhn-conf/rhn_server_iss.conf | 5
backend/rhn-conf/rhn_server_satexport.conf | 7
backend/rhn-conf/rhn_server_satexport_internal.conf | 2
backend/satellite_tools/constants.py | 2
backend/satellite_tools/disk_dumper/dumper.py | 204 --------------------
backend/satellite_tools/exporter/exportLib.py | 46 ----
backend/spacewalk-backend.spec | 1
7 files changed, 14 insertions(+), 253 deletions(-)
New commits:
commit 909ae679269dbf98c261ac1b31b683600e91faf6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 15:50:13 2010 +0200
since ErrataSynopsisDumper removal, ErrataDumper and ErrataDumperEx are equal
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index b98b00b..c82865b 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -751,7 +751,7 @@ class XML_DumperEx(XML_Dumper):
writer = self._get_xml_writer()
dumper = SatelliteDumper(writer,
- ErrataDumperEx(writer, errata_hash.values()))
+ ErrataDumper(writer, errata_hash.values()))
dumper.dump()
writer.flush()
log_debug(4, "OK")
@@ -1305,40 +1305,6 @@ class ErrataDumper(CachedDumper, exportLib.ErrataDumper):
log_debug(6, data)
return exportLib.ErrataDumper.dump_subelement(self, data)
-class ErrataDumperEx(CachedDumper, exportLib.ErrataDumper):
- def __init__(self, writer, errata):
- h = rhnSQL.prepare("""
- select
- e.id,
- e.org_id,
- e.advisory_name,
- e.advisory,
- e.advisory_type,
- e.advisory_rel,
- e.product,
- e.description,
- e.synopsis,
- e.topic,
- e.solution,
- TO_CHAR(e.issue_date, 'YYYYMMDDHH24MISS') issue_date,
- TO_CHAR(e.update_date, 'YYYYMMDDHH24MISS') update_date,
- TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified,
- e.refers_to,
- e.notes
- from rhnErrata e
- where e.id = :errata_id
- """)
- CachedDumper.__init__(self, writer, statement=h, params=errata)
-
- def _get_key(self, params):
- errata_id = str(params['errata_id'])
- hash_val = rhnLib.hash_object_id(errata_id, 1)
- return "xml-errata/%s/rhn-erratum-%s.xml" % (hash_val, errata_id)
-
- def _dump_subelement(self, data):
- log_debug(6, data)
- return exportLib.ErrataDumper.dump_subelement(self, data)
-
class KickstartableTreesDumper(CachedDumper, exportLib.KickstartableTreesDumper):
_query_lookup_ks_tree = rhnSQL.Statement("""
select kt.id,
commit 473815c490e42e4e5e76eb47aa9f3a90b14bae0e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 15:46:30 2010 +0200
once synposis_column has been removed from ErrataDumper, ErrataSynopsisDumper is equal
to ErrataDumper
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 0c385e8..b98b00b 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -1305,7 +1305,7 @@ class ErrataDumper(CachedDumper, exportLib.ErrataDumper):
log_debug(6, data)
return exportLib.ErrataDumper.dump_subelement(self, data)
-class ErrataDumperEx(CachedDumper, exportLib.ErrataSynopsisDumper):
+class ErrataDumperEx(CachedDumper, exportLib.ErrataDumper):
def __init__(self, writer, errata):
h = rhnSQL.prepare("""
select
@@ -1337,7 +1337,7 @@ class ErrataDumperEx(CachedDumper, exportLib.ErrataSynopsisDumper):
def _dump_subelement(self, data):
log_debug(6, data)
- return exportLib.ErrataSynopsisDumper.dump_subelement(self, data)
+ return exportLib.ErrataDumper.dump_subelement(self, data)
class KickstartableTreesDumper(CachedDumper, exportLib.KickstartableTreesDumper):
_query_lookup_ks_tree = rhnSQL.Statement("""
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index e9f8e69..55a2872 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -1017,17 +1017,6 @@ class _ErratumDumper(BaseRowDumper):
return ArrayIterator(arr)
-class ErrataSynopsisDumper(ErrataDumper):
- # include severity into synopsis before
- # exporting to satellite.
- # Also ignore the first 18 characters in
- # the label(errata.sev.label.) from
- # rhnErrataSeverity table
- synposis_column = """
- (select SUBSTR(label,18) || ':'
- from rhnErrataSeverity
- where id = e.severity_id) || e.synopsis synposis,"""
-
class _ErratumKeywordDumper(BaseDumper):
tag_name = 'rhn-erratum-keywords'
commit 5d28295e8e4be69ba9187d66cc805544f91e97ef
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 15:42:22 2010 +0200
removed query not unsed anywhere, because all subclasses set iterator in their
__init__()
moreover there has been a syntax error (e.synposis)
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index 5a6ca8a..e9f8e69 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -906,36 +906,10 @@ class _PackageFilesDumper(BaseDumper):
class ErrataDumper(BaseDumper):
tag_name = 'rhn-errata'
- synposis_column = "e.synposis,"
-
def set_iterator(self):
if self._iterator:
return self._iterator
-
- _query_errata_info = """
- select
- e.id,
- e.org_id,
- e.advisory_name,
- e.advisory,
- e.advisory_type,
- e.advisory_rel,
- e.product,
- e.description,
- %s
- e.topic,
- e.solution,
- TO_CHAR(e.issue_date, 'YYYYMMDDHH24MISS') issue_date,
- TO_CHAR(e.update_date, 'YYYYMMDDHH24MISS') update_date,
- TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified,
- e.refers_to,
- e.notes
- from rhnErrata e
- where rownum < 3
- """
- h = rhnSQL.prepare(_query_errata_info % self.synposis_column)
- h.execute()
- return h
+ raise NotImplementedError, "To be overridden in a child class"
def dump_subelement(self, data):
d = _ErratumDumper(self._writer, data)
commit 8beaf5a5178e1c56d1fa42537f6a83674cb69325
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 14:33:45 2010 +0200
_ErratumSynopsisDumper not used anywhere
diff --git a/backend/satellite_tools/exporter/exportLib.py
b/backend/satellite_tools/exporter/exportLib.py
index 6b69a3a..5a6ca8a 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -1054,13 +1054,6 @@ class ErrataSynopsisDumper(ErrataDumper):
from rhnErrataSeverity
where id = e.severity_id) || e.synopsis synposis,"""
-class _ErratumSynopsisDumper(_ErratumDumper):
- # SATSYNC: Ignore the Oval files stuff(typeid=4)
- # while exporting errata File info to satellite
- type_id_column = """and ef.type != (select id
- from rhnErrataFileType
- where label =
'OVAL')"""
-
class _ErratumKeywordDumper(BaseDumper):
tag_name = 'rhn-erratum-keywords'
commit f306db35a6f6a7b2d209ea57a19ed7d290c0c1cf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 12:08:51 2010 +0200
removed ChannelsDumper.__init__() which only call __init__() from its parrent
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index c721c4a..0c385e8 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -974,8 +974,6 @@ class ChannelsDumper(exportLib.ChannelsDumper):
and c.parent_channel = pc.id (+)
and c.checksum_type_id = ct.id (+)
""")
- def __init__(self, writer, channels):
- exportLib.ChannelsDumper.__init__(self, writer, channels)
def dump_subelement(self, data):
log_debug(6, data)
commit c1b998d6b0685573a4d7f3c2433e18ed66fcceda
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 1 11:56:28 2010 +0200
removed methods and queries from _ChannelsDumper which are exact copies of
exportLib._ChannelDumper's ones
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 41f392c..c721c4a 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -994,39 +994,6 @@ class ChannelsDumper(exportLib.ChannelsDumper):
class _ChannelsDumper(exportLib._ChannelDumper):
tag_name = 'rhn-channel'
- def set_attributes(self):
- channel_id = self._row['id']
-
- packages = map(lambda x: "rhn-package-%s" % x,
self._get_package_ids())
- # XXX channel-errata is deprecated and should go away in dump version
- # 3 or higher - we now dump that information in its own subelement
- # rhn-channel-errata
- errata = map(lambda x: "rhn-erratum-%s" % x, self._get_errata_ids())
- ks_trees = self._get_kickstartable_trees()
-
- return {
- 'channel-id' : 'rhn-channel-%s' % channel_id,
- 'org_id' : self._row['org_id'],
- 'label' : self._row['label'],
- 'channel-arch' : self._row['channel_arch'],
- 'packages' : string.join(packages),
- 'channel-errata' : string.join(errata),
- 'kickstartable-trees' : string.join(ks_trees),
- }
-
- _query_channel_families = rhnSQL.Statement("""
- select cf.id, cf.label
- from rhnChannelFamily cf, rhnChannelFamilyMembers cfm
- where cfm.channel_family_id = cf.id
- and cfm.channel_id = :channel_id
- """)
- _query_dist_channel_map = rhnSQL.Statement("""
- select dcm.os, dcm.release, ca.label channel_arch
- from rhnDistChannelMap dcm, rhnChannelArch ca
- where dcm.channel_id = :channel_id
- and dcm.channel_arch_id = ca.id
- """)
-
def set_iterator(self):
channel_id = self._row['id']
arr = []
@@ -1103,32 +1070,6 @@ class _ChannelsDumper(exportLib._ChannelDumper):
h.execute(channel_id=channel_id)
return map(lambda x: x['package_id'], h.fetchall_dict() or [])
- _query_get_source_package_ids = rhnSQL.Statement("""
- select distinct ps.id, sr.name source_rpm,
- TO_CHAR(ps.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnChannelPackage cp, rhnPackage p, rhnPackageSource ps,
- rhnSourceRPM sr
- where cp.channel_id = :channel_id
- and cp.package_id = p.id
- and p.source_rpm_id = ps.source_rpm_id
- and ((p.org_id is null and ps.org_id is null) or
- p.org_id = ps.org_id)
- and ps.source_rpm_id = sr.id
- """)
- def _get_cursor_source_packages(self):
- channel_id = self._row['id']
- h = rhnSQL.prepare(self._query_get_source_package_ids)
- h.execute(channel_id=channel_id)
- return h
-
- _query__get_errata_ids = rhnSQL.Statement("""
- select ce.errata_id, e.advisory_name,
- TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnChannelErrata ce, rhnErrata e
- where ce.channel_id = :channel_id
- and ce.errata_id = e.id
- """)
-
_query__get_errata_ids_by_limits = rhnSQL.Statement("""
select ce.errata_id, e.advisory_name,
TO_CHAR(e.last_modified, 'YYYYMMDDHH24MISS') last_modified
@@ -1152,13 +1093,6 @@ class _ChannelsDumper(exportLib._ChannelDumper):
h.execute(channel_id=channel_id)
return map(lambda x: x['errata_id'], h.fetchall_dict() or [])
- _query_get_kickstartable_trees = rhnSQL.Statement("""
- select kt.label
- from rhnKickstartableTree kt
- where kt.channel_id = :channel_id
- and kt.org_id is null
- """)
-
_query_get_kickstartable_trees_by_limits = rhnSQL.Statement("""
select kt.label
from rhnKickstartableTree kt
commit e0d23ec6d08a059df18ed63c5d799c87a4c9a461
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat May 29 00:26:17 2010 +0200
removed unused import
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 72afad3..41f392c 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -15,7 +15,6 @@
#
import time
-import math
import gzip
import string
import tempfile
commit 2b578920101c3e57f8d3b541ee4916c576241721
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat May 29 00:21:46 2010 +0200
removed dump_blacklist_obsoletes(), dump_arches(),
dump_server_group_type_server_arches() and _cache_channel_packages_short() from
XML_DumperEx because they are identical to those in XML_Dumper which it's inherited
from
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index a067239..72afad3 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -609,55 +609,6 @@ class XML_DumperEx(XML_Dumper):
log_debug(3, "Closed")
# Dumper functions here
- def dump_blacklist_obsoletes(self):
- log_debug(2)
- writer = self._get_xml_writer()
- dumper = SatelliteDumper(writer,
- exportLib.BlacklistObsoletesDumper(writer))
- dumper.dump()
- writer.flush()
- log_debug(4, "OK")
- self.close()
- return 0
-
- def dump_arches(self, rpm_arch_type_only=0):
- log_debug(2)
- writer = self._get_xml_writer()
- dumper = SatelliteDumper(writer,
- exportLib.ChannelArchesDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- exportLib.PackageArchesDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- exportLib.ServerArchesDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- exportLib.CPUArchesDumper(writer),
- exportLib.ServerPackageArchCompatDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- exportLib.ServerChannelArchCompatDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- exportLib.ChannelPackageArchCompatDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only),
- )
- dumper.dump()
- writer.flush()
- log_debug(4, "OK")
- self.close()
- return 0
-
- def dump_server_group_type_server_arches(self, rpm_arch_type_only=0,
- virt_filter=0):
- log_debug(2)
- writer = self._get_xml_writer()
- dumper = SatelliteDumper(writer,
- exportLib.ServerGroupTypeServerArchCompatDumper(writer,
- rpm_arch_type_only=rpm_arch_type_only, virt_filter=virt_filter),
- )
- dumper.dump()
- writer.flush()
- log_debug(4, "OK")
- self.close()
- return 0
-
def dump_channel_families(self, virt_filter=0):
log_debug(2)
@@ -736,36 +687,6 @@ class XML_DumperEx(XML_Dumper):
# We're done
return 0
- def _cache_channel_packages_short(self, channel_id, key, last_modified):
- """ Caches the short package entries for channel_id
"""
- # Create a temporary file
- temp_stream = tempfile.TemporaryFile()
- # Always compress the result
- compress_level = 5
- stream = gzip.GzipFile(None, "wb", compress_level, temp_stream)
- writer = xmlWriter.XMLWriter(stream=stream)
-
- # Fetch packages
- h = rhnSQL.prepare(self._query_get_channel_packages)
- h.execute(channel_id=channel_id)
- package_ids = h.fetchall_dict() or []
- # Sort packages
- package_ids.sort(lambda a, b: cmp(a['package_id'],
b['package_id']))
-
- dumper = SatelliteDumper(writer,
- ShortPackagesDumper(writer, package_ids))
- dumper.dump()
- writer.flush()
- # We're done with the stream object
- stream.close()
- del stream
- temp_stream.seek(0, 0)
- # Set the value in the cache. We don't recompress the result since
- # it's already compressed
- rhnCache.set(key, temp_stream.read(), modified=last_modified,
- compressed=0, raw=1)
- return self._normalize_compressed_stream(temp_stream)
-
def _packages(self, packages, prefix, dump_class, sources=0):
if sources:
h = self.get_source_packages_statement()
commit 1a9000ae28b1677de5eaaf0a3bd372a4eae41d23
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat May 29 00:09:14 2010 +0200
removed SatelliteDumperEx; it's equivalent of SatelliteDumper
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 4799997..a067239 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -612,7 +612,7 @@ class XML_DumperEx(XML_Dumper):
def dump_blacklist_obsoletes(self):
log_debug(2)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
exportLib.BlacklistObsoletesDumper(writer))
dumper.dump()
writer.flush()
@@ -623,7 +623,7 @@ class XML_DumperEx(XML_Dumper):
def dump_arches(self, rpm_arch_type_only=0):
log_debug(2)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
exportLib.ChannelArchesDumper(writer,
rpm_arch_type_only=rpm_arch_type_only),
exportLib.PackageArchesDumper(writer,
@@ -648,7 +648,7 @@ class XML_DumperEx(XML_Dumper):
virt_filter=0):
log_debug(2)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
exportLib.ServerGroupTypeServerArchCompatDumper(writer,
rpm_arch_type_only=rpm_arch_type_only, virt_filter=virt_filter),
)
@@ -665,7 +665,7 @@ class XML_DumperEx(XML_Dumper):
h.execute()
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
exportLib.ChannelFamiliesDumper(writer,
data_iterator=h, null_max_members=0, virt_filter=virt_filter),)
dumper.dump()
@@ -679,7 +679,7 @@ class XML_DumperEx(XML_Dumper):
channels = self._validate_channels(channel_labels=channel_labels)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer, ChannelsDumperEx(writer,
+ dumper = SatelliteDumper(writer, ChannelsDumperEx(writer,
channels=channels.values()))
dumper.dump()
writer.flush()
@@ -752,7 +752,7 @@ class XML_DumperEx(XML_Dumper):
# Sort packages
package_ids.sort(lambda a, b: cmp(a['package_id'],
b['package_id']))
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
ShortPackagesDumper(writer, package_ids))
dumper.dump()
writer.flush()
@@ -794,7 +794,7 @@ class XML_DumperEx(XML_Dumper):
packages_hash[package_id] = row
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
dump_class(writer, packages_hash.values()))
dumper.dump()
writer.flush()
@@ -830,7 +830,7 @@ class XML_DumperEx(XML_Dumper):
errata_hash[errata_id] = row
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
ErrataDumperEx(writer, errata_hash.values()))
dumper.dump()
writer.flush()
@@ -844,7 +844,7 @@ class XML_DumperEx(XML_Dumper):
kickstart_labels=kickstart_labels)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer,
+ dumper = SatelliteDumper(writer,
KickstartableTreesDumper(writer, kickstarts=kickstarts))
dumper.dump()
writer.flush()
@@ -855,7 +855,7 @@ class XML_DumperEx(XML_Dumper):
def dump_product_names(self):
log_debug(4)
writer = self._get_xml_writer()
- dumper = SatelliteDumperEx(writer, exportLib.ProductNamesDumper(writer))
+ dumper = SatelliteDumper(writer, exportLib.ProductNamesDumper(writer))
dumper.dump()
writer.flush()
self.close()
@@ -869,14 +869,6 @@ class SatelliteDumper(exportLib.SatelliteDumper):
attributes['generation'] = CFG.SAT_CERT_GENERATION
return attributes
-class SatelliteDumperEx(SatelliteDumper):
- def set_attributes(self):
- """ Overriding with our own version """
- attributes = exportLib.SatelliteDumper.set_attributes(self)
- attributes['version'] = constants.PROTOCOL_VERSION
- attributes['generation'] = CFG.SAT_CERT_GENERATION
- return attributes
-
class QueryIterator:
""" A query iterator successively applies the list of params as
execute() to the
statement that was passed in, and presents the union of the result sets as a
commit dbb8baadc9c3c0f27f86f57f8646fe91af0060da
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat May 29 00:06:39 2010 +0200
dumper should use export xml dump version
diff --git a/backend/satellite_tools/disk_dumper/dumper.py
b/backend/satellite_tools/disk_dumper/dumper.py
index 67f49dd..4799997 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -865,7 +865,7 @@ class SatelliteDumper(exportLib.SatelliteDumper):
def set_attributes(self):
""" Overriding with our own version """
attributes = exportLib.SatelliteDumper.set_attributes(self)
- attributes['version'] = CFG.XML_DUMP_VERSION
+ attributes['version'] = constants.PROTOCOL_VERSION
attributes['generation'] = CFG.SAT_CERT_GENERATION
return attributes
commit 7f1741ce692dadfea6829b5087ac16d922dbea7d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat May 29 00:05:53 2010 +0200
added comments to distinguish exported and imported xml dump versions
diff --git a/backend/rhn-conf/rhn_server_iss.conf b/backend/rhn-conf/rhn_server_iss.conf
index c3ff4ce..cdc226a 100644
--- a/backend/rhn-conf/rhn_server_iss.conf
+++ b/backend/rhn-conf/rhn_server_iss.conf
@@ -1,10 +1,11 @@
# ** DO NOT EDIT **
-# RHN config for requests traveling through the /SAT-XML-DUMP receiver
+# RHN config for requests traveling through the /SAT receiver
# ISS - Inter Spacewalk Sync
# variables which affects live synchronization between two Spacewalk or
# between Satellite and hosted.
-xml_dump_version = 3.5
+# newest XML dump version we can import
+xml_dump_version = 3.6
use_database_cache = 0
diff --git a/backend/satellite_tools/constants.py b/backend/satellite_tools/constants.py
index baebe1a..1dd2eb8 100644
--- a/backend/satellite_tools/constants.py
+++ b/backend/satellite_tools/constants.py
@@ -16,7 +16,9 @@
Constant values (protocol versions, etc) for satellite sync/exporter.
"""
+# XML dump version we export
PROTOCOL_VERSION = 3.6
+
ALLOWED_SYNC_PROTOCOL_VERSIONS = ['3.6', '3.5', '3.4',
'3.3', '3.2', '3.1', '3.0']
# Support for checksums other then md5
commit 4965fe20bc0b537511e56aaeb21aca75aa2fb7da
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 28 23:52:05 2010 +0200
fixed handler name to which this config file belongs
diff --git a/backend/rhn-conf/rhn_server_satexport_internal.conf
b/backend/rhn-conf/rhn_server_satexport_internal.conf
index 3979f9d..9805602 100644
--- a/backend/rhn-conf/rhn_server_satexport_internal.conf
+++ b/backend/rhn-conf/rhn_server_satexport_internal.conf
@@ -1,5 +1,5 @@
# ** DO NOT EDIT **
-# RHN config for requests traveling through the /SAT-XML-DUMP receiver
+# RHN config for requests traveling through the /SAT-DUMP-INTERNAL receiver
#
log_file = /var/log/rhn/rhn_sat_export_internal.log
commit 8f54461ff8b74576351d4b989a2bdf100d27eb20
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 28 23:41:28 2010 +0200
removed rhn_server_satexport.conf from spec
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a02aba6..1684e9a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -494,7 +494,6 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(640,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
%config %{_sysconfdir}/logrotate.d/rhn_sat_export_internal
-%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport.conf
%attr(640,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
commit fded56b062035277bc3adbb2a5cbec57c74a02af
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 28 23:35:21 2010 +0200
there is no /SAT-XML-DUMP and this file is not used anywhere
diff --git a/backend/rhn-conf/rhn_server_satexport.conf
b/backend/rhn-conf/rhn_server_satexport.conf
deleted file mode 100644
index 9d67d71..0000000
--- a/backend/rhn-conf/rhn_server_satexport.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# ** DO NOT EDIT **
-# RHN config for requests traveling through the /SAT-XML-DUMP receiver
-#
-
-use_database_cache = 0
-
-sat_cert_generation = 2