Changes to 'refs/tags/spacewalk-backend-1.8.17-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.8.17-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-16 09:30 +0000
Tagging package [spacewalk-backend] version [1.8.17-1] in directory [backend/].
Changes since spacecmd-1.8.4-1:
Miroslav Suchý (4):
805582 - introduce new option --whole-errata to exporter
805582 - include even package which does not belong to errata
add man page for --use-rhn-date and --use-sync-date
Automatic commit of package [spacewalk-backend] release [1.8.17-1].
---
backend/satellite_tools/disk_dumper/dumper.py | 11
backend/satellite_tools/disk_dumper/iss.py | 139 ++++++++--
backend/satellite_tools/disk_dumper/iss_ui.py | 2
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 33 ++
backend/satellite_tools/exporter/exportLib.py | 43 ++-
backend/spacewalk-backend.spec | 7
rel-eng/packages/spacewalk-backend | 2
7 files changed, 203 insertions(+), 34 deletions(-)
---
12 years, 2 months
4 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/disk_dumper/dumper.py | 11
backend/satellite_tools/disk_dumper/iss.py | 139 ++++++++--
backend/satellite_tools/disk_dumper/iss_ui.py | 2
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 33 ++
backend/satellite_tools/exporter/exportLib.py | 43 ++-
backend/spacewalk-backend.spec | 7
rel-eng/packages/spacewalk-backend | 2
7 files changed, 203 insertions(+), 34 deletions(-)
New commits:
commit 4a218be3e28dd5c81993c8daf50b63269e80300f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 16 11:30:09 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b7cf687..9cc9598 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.16
+Version: 1.8.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -673,6 +673,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Apr 16 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.17-1
+- add man page for --use-rhn-date and --use-sync-date
+- 805582 - include even package which does not belong to errata
+- 805582 - introduce new option --whole-errata to exporter
+
* Fri Apr 13 2012 Jan Pazdziora 1.8.16-1
- 812329 - adding PostgreSQL configuration and log files to the debug.
- 812329 - updating rhn-charsets man page -- update list of value names, no
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f0d55a8..90a5d05 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.16-1 backend/
+1.8.17-1 backend/
commit 2acac2ae79fe38a2aad1897ca57afb22984a53a8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 16 11:28:46 2012 +0200
add man page for --use-rhn-date and --use-sync-date
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
index 992c43b..0f7c9c7 100644
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
@@ -46,6 +46,12 @@ A tool that exports satellite content into a directory in an XML format. That co
<arg>--end-date=<replaceable>END_DATE</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
+ <arg>--use-rhn-date</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>--use-sync-date</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
<arg>--whole-errata</arg>
</cmdsynopsis>
<cmdsynopsis>
@@ -157,6 +163,22 @@ A tool that exports satellite content into a directory in an XML format. That co
</listitem>
</varlistentry>
<varlistentry>
+ <term>--use-rhn-date</term>
+ <listitem>
+ <para>Limit exported packages according to the date when
+ they appeared at Red Hat Network. This is default.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--use-sync-date</term>
+ <listitem>
+ <para>Limit exported packages according to the date they
+ where pulled into satellite.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--whole-errata</term>
<listitem>
<para>Always include package if it belongs to errata which
commit 951f7653be36d225237c6664ffc5654b48033d2b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 16 11:23:56 2012 +0200
805582 - include even package which does not belong to errata
if --whole-errata is set, and package does not belong to errata, use package date and not errata date
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 0b62521..668f4b1 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -244,12 +244,11 @@ class Dumper(dumper.XML_Dumper):
try:
if self.whole_errata and self.start_date:
query = """ select rcp.package_id id, rp.path path
- from rhnChannelPackage rcp, rhnPackage rp,
- rhnErrataPackage rep, rhnErrata re
+ from rhnChannelPackage rcp, rhnPackage rp
+ left join rhnErrataPackage rep on rp.id = rep.package_id
+ left join rhnErrata re on rep.errata_id = re.id
where rcp.package_id = rp.id
and rcp.channel_id = :channel_id
- and rp.id = rep.package_id
- and rep.errata_id = re.id
"""
else:
query = """
@@ -263,13 +262,21 @@ class Dumper(dumper.XML_Dumper):
if self.whole_errata:
if self.use_rhn_date:
query += """ and
- re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
- and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
else:
query += """ and
- re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
elif self.use_rhn_date:
query += """
@@ -303,12 +310,11 @@ class Dumper(dumper.XML_Dumper):
query = """
select rp.id package_id,
TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnPackage rp, rhnChannelPackage rcp,
- rhnErrataPackage rep, rhnErrata re
+ from rhnChannelPackage rcp, rhnPackage rp
+ left join rhnErrataPackage rep on rp.id = rep.package_id
+ left join rhnErrata re on rep.errata_id = re.id
where rcp.channel_id = :channel_id
and rcp.package_id = rp.id
- and rp.id = rep.package_id
- and rep.errata_id = re.id
"""
else:
query = """
@@ -322,13 +328,21 @@ class Dumper(dumper.XML_Dumper):
if self.whole_errata:
if self.use_rhn_date:
query += """ and
- re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
else:
query += """ and
- re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
elif self.use_rhn_date:
query += """
@@ -373,20 +387,28 @@ class Dumper(dumper.XML_Dumper):
"""
if self.start_date:
if self.whole_errata:
- query += """, rhnErrataFilePackageSource refps, rhnErrataFile ref, rhnErrata re
- where refps.package_id = ps.id
- and refps.errata_file_id = ref.id
- and ref.errata_id = re.id
+ query += """
+ left join rhnErrataFilePackageSource refps on refps.package_id = ps.id
+ left join rhnErrataFile ref on refps.errata_file_id = ref.id
+ left join rhnErrata re on ref.errata_id = re.id
"""
if self.use_rhn_date:
query += """ and
- re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (refps.package_id is NULL
+ and ps.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and ps.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
else:
query += """ and
- re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ ) or (refps.package_id is NULL
+ and ps.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and ps.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
+ )
"""
elif self.use_rhn_date:
query += """
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index 46819af..5c985f1 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -326,26 +326,35 @@ class _ChannelDumper(BaseRowDumper):
_query_get_package_ids_by_date_limits_whole_errata = rhnSQL.Statement("""
select rcp.package_id as id
- from rhnPackage rp, rhnChannelPackage rcp,
+ from rhnChannelPackage rcp, rhnPackage rp
+ left join rhnErrataPackage rep on rp.id = rep.package_id
+ left join rhnErrata re on rep.errata_id = re.id
rhnErrataPackage rep, rhnErrata re
where rcp.channel_id = :channel_id
and rcp.package_id = rp.id
- and rp.id = rep.package_id
- and rep.errata_id = re.id
- and re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
- and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ and ((re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rcp.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS'))
+ )
""")
_query_get_package_ids_by_rhndate_limits_whole_errata = rhnSQL.Statement("""
select rcp.package_id as id
- from rhnPackage rp, rhnChannelPackage rcp,
- rhnErrataPackage rep, rhnErrata re
+ from rhnChannelPackage rcp, rhnPackage rp
+ left join rhnErrataPackage rep on rp.id = rep.package_id
+ left join rhnErrata re on rep.errata_id = re.id
where rcp.channel_id = :channel_id
and rcp.package_id = rp.id
and rp.id = rep.package_id
and rep.errata_id = re.id
- and re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
- and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ and ((re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ ) or (rep.package_id is NULL
+ and rp.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS'))
+ )
""")
commit 5846c25d3227ee2f69a934d620c4bd8387b1019f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Apr 13 15:26:45 2012 +0200
805582 - introduce new option --whole-errata to exporter
This will export whole errata if it is within given date range.
diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py
index 7927bbd..bfc509f 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -195,12 +195,13 @@ class XML_Dumper:
data_iterator=h, null_max_members=0)
return 0
- def dump_channels(self, channel_labels=None, start_date=None, end_date=None, use_rhn_date=True):
+ def dump_channels(self, channel_labels=None, start_date=None, end_date=None, use_rhn_date=True, whole_errata=False):
log_debug(2)
#channels = self._validate_channels(channel_labels=channel_labels)
self._write_dump(ChannelsDumper,
- channels=channel_labels, start_date=start_date, end_date=end_date, use_rhn_date=use_rhn_date)
+ channels=channel_labels, start_date=start_date, end_date=end_date, use_rhn_date=use_rhn_date,
+ whole_errata=whole_errata)
return 0
def _send_headers(self, error=0, init_compressed_stream=1):
@@ -674,16 +675,18 @@ class ChannelsDumper(exportLib.ChannelsDumper):
and c.channel_arch_id = ca.id
""")
- def __init__(self, writer, channels=[], start_date=None, end_date=None, use_rhn_date=True):
+ def __init__(self, writer, channels=[], start_date=None, end_date=None, use_rhn_date=True, whole_errata=False):
exportLib.ChannelsDumper.__init__(self, writer, channels)
self.start_date = start_date
self.end_date = end_date
self.use_rhn_date = use_rhn_date
+ self.whole_errata = whole_errata
def dump_subelement(self, data):
log_debug(6, data)
#return exportLib.ChannelsDumper.dump_subelement(self, data)
- c = exportLib._ChannelDumper(self._writer, data, self.start_date, self.end_date, self.use_rhn_date)
+ c = exportLib._ChannelDumper(self._writer, data, self.start_date, self.end_date,
+ self.use_rhn_date, self.whole_errata)
c.dump()
def set_iterator(self):
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 113a28c..0b62521 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -154,7 +154,7 @@ class FileMapper:
"""
class Dumper(dumper.XML_Dumper):
def __init__(self, outputdir, channel_labels, hardlinks, start_date, \
- end_date, use_rhn_date):
+ end_date, use_rhn_date, whole_errata):
dumper.XML_Dumper.__init__(self)
self.fm = FileMapper(outputdir)
self.mp = outputdir
@@ -167,6 +167,7 @@ class Dumper(dumper.XML_Dumper):
self.start_date = start_date
self.end_date = end_date
self.use_rhn_date = use_rhn_date
+ self.whole_errata = whole_errata
if self.start_date:
dates = { 'start_date' : self.start_date,
@@ -241,24 +242,46 @@ class Dumper(dumper.XML_Dumper):
###BINARY RPM INFO###
try:
- query = """
- select rcp.package_id id, rp.path path
- from rhnChannelPackage rcp, rhnPackage rp
- where rcp.package_id = rp.id
- and rcp.channel_id = :channel_id
+ if self.whole_errata and self.start_date:
+ query = """ select rcp.package_id id, rp.path path
+ from rhnChannelPackage rcp, rhnPackage rp,
+ rhnErrataPackage rep, rhnErrata re
+ where rcp.package_id = rp.id
+ and rcp.channel_id = :channel_id
+ and rp.id = rep.package_id
+ and rep.errata_id = re.id
"""
+ else:
+ query = """
+ select rcp.package_id id, rp.path path
+ from rhnChannelPackage rcp, rhnPackage rp
+ where rcp.package_id = rp.id
+ and rcp.channel_id = :channel_id
+ """
+
if self.start_date:
- if self.use_rhn_date:
+ if self.whole_errata:
+ if self.use_rhn_date:
+ query += """ and
+ re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ else:
+ query += """ and
+ re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ elif self.use_rhn_date:
query += """
and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
- and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ and ((rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
"""
- self.brpm_query = rhnSQL.Statement(query)
+ self.brpm_query = rhnSQL.Statement(query)
brpm_data = rhnSQL.prepare(self.brpm_query)
#self.brpms is a list of binary rpm info. It is a list of dictionaries, where each dictionary
@@ -268,7 +291,6 @@ class Dumper(dumper.XML_Dumper):
for ch in self.channel_ids:
brpm_data.execute(channel_id=ch['channel_id'], **dates)
self.brpms = self.brpms + (brpm_data.fetchall_dict() or [])
-
except Exception, e:
tbout = cStringIO.StringIO()
Traceback(mail=0, ostream=tbout, with_locals=1)
@@ -277,23 +299,46 @@ class Dumper(dumper.XML_Dumper):
###PACKAGE INFO###
#This will grab channel package information for a given channel.
try:
- query = """
+ if self.whole_errata and self.start_date:
+ query = """
select rp.id package_id,
- TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified
- from rhnPackage rp, rhnChannelPackage rcp
- where rcp.channel_id = :channel_id
- and rcp.package_id = rp.id
- """
- if self.start_date:
- if self.use_rhn_date:
+ TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified
+ from rhnPackage rp, rhnChannelPackage rcp,
+ rhnErrataPackage rep, rhnErrata re
+ where rcp.channel_id = :channel_id
+ and rcp.package_id = rp.id
+ and rp.id = rep.package_id
+ and rep.errata_id = re.id
+ """
+ else:
+ query = """
+ select rp.id package_id,
+ TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified
+ from rhnPackage rp, rhnChannelPackage rcp
+ where rcp.channel_id = :channel_id
+ and rcp.package_id = rp.id
+ """
+ if self.start_date:
+ if self.whole_errata:
+ if self.use_rhn_date:
+ query += """ and
+ re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ else:
+ query += """ and
+ re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ elif self.use_rhn_date:
query += """
and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
- and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ and (rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS'))
"""
self.package_query = rhnSQL.Statement(query)
package_data = rhnSQL.prepare(self.package_query)
@@ -322,11 +367,28 @@ class Dumper(dumper.XML_Dumper):
try:
query = """
select ps.id package_id,
- TO_CHAR(ps.last_modified,'YYYYMMDDHH24MISS') last_modified, ps.source_rpm_id source_rpm_id
+ TO_CHAR(ps.last_modified,'YYYYMMDDHH24MISS') last_modified,
+ ps.source_rpm_id source_rpm_id
from rhnPackageSource ps
"""
if self.start_date:
- if self.use_rhn_date:
+ if self.whole_errata:
+ query += """, rhnErrataFilePackageSource refps, rhnErrataFile ref, rhnErrata re
+ where refps.package_id = ps.id
+ and refps.errata_file_id = ref.id
+ and ref.errata_id = re.id
+ """
+ if self.use_rhn_date:
+ query += """ and
+ re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ else:
+ query += """ and
+ re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ elif self.use_rhn_date:
query += """
where ps.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
and ps.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
@@ -338,7 +400,7 @@ class Dumper(dumper.XML_Dumper):
"""
self.source_package_query = rhnSQL.Statement(query)
source_package_data = rhnSQL.prepare(self.source_package_query)
- source_package_data.execute(**dates)
+ source_package_data.execute(**dates)
#self.src_pkg_info is a list of dictionaries containing the source package information.
#The keys for each dictionary are 'package_id', 'last_modified', and 'source_rpm_id'.
@@ -558,7 +620,7 @@ class Dumper(dumper.XML_Dumper):
pb.printAll(1)
for channel in self.channel_ids:
self.set_filename(self.fm.getChannelsFile(channel['label']))
- dumper.XML_Dumper.dump_channels(self, [channel], self.start_date, self.end_date, self.use_rhn_date)
+ dumper.XML_Dumper.dump_channels(self, [channel], self.start_date, self.end_date, self.use_rhn_date, self.whole_errata)
log2email(4, "Channel: %s" % channel['label'])
log2email(5, "Channel exported to %s" % self.fm.getChannelsFile(channel['label']))
@@ -968,10 +1030,13 @@ class ExporterMain:
self.start_date = None
self.end_date = None
+ if self.start_date and self.options.whole_errata:
+ self.whole_errata = self.options.whole_errata
+
#verify mountpoint
if os.access(self.outputdir, os.F_OK|os.R_OK|os.W_OK):
if os.path.isdir(self.outputdir):
- self.dumper = Dumper(self.outputdir, self.options.channel, self.options.hard_links, start_date=self.start_date, end_date=self.end_date, use_rhn_date=self.options.use_rhn_date)
+ self.dumper = Dumper(self.outputdir, self.options.channel, self.options.hard_links, start_date=self.start_date, end_date=self.end_date, use_rhn_date=self.options.use_rhn_date, whole_errata=self.options.whole_errata)
self.actionmap = {
'arches' : {'dump' : self.dumper.dump_arches},
'arches-extra' : {'dump' : self.dumper.dump_server_group_type_server_arches},
diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py b/backend/satellite_tools/disk_dumper/iss_ui.py
index 6d8ee7c..be972cf 100644
--- a/backend/satellite_tools/disk_dumper/iss_ui.py
+++ b/backend/satellite_tools/disk_dumper/iss_ui.py
@@ -42,6 +42,8 @@ class UI:
help="Limit exported packages according to the date when they appeared at Red Hat Network."),
option( "--use-sync-date", action="store_true",
help="Limit exported packages according to the date they where pulled into satellite."),
+ option( "--whole-errata", action="store_true",
+ help="Always include package if it belongs to errata which is withing start/end-date range."),
option( "--make-isos", action="store",
help="Create channel dump isos a directory called satellite-isos. Usage: --make-isos=cd or dvd"),
option("-p", "--print-configuration", action="store_true", default=0,
diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
index 4214458..992c43b 100644
--- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
+++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml
@@ -46,6 +46,9 @@ A tool that exports satellite content into a directory in an XML format. That co
<arg>--end-date=<replaceable>END_DATE</replaceable></arg>
</cmdsynopsis>
<cmdsynopsis>
+ <arg>--whole-errata</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
<arg>-p</arg>
<arg>--print-configuration</arg>
</cmdsynopsis>
@@ -154,6 +157,14 @@ A tool that exports satellite content into a directory in an XML format. That co
</listitem>
</varlistentry>
<varlistentry>
+ <term>--whole-errata</term>
+ <listitem>
+ <para>Always include package if it belongs to errata which
+ is withing start/end-date range.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>--make-isos=<replaceable>MAKE_ISOS</replaceable></term>
<listitem>
<para>Create channel dump isos directory called satellite-isos.
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index 1646c58..46819af 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -201,11 +201,12 @@ class SatelliteDumper(BaseDumper):
class _ChannelDumper(BaseRowDumper):
tag_name = 'rhn-channel'
- def __init__(self, writer, row, start_date=None, end_date=None, use_rhn_date=True):
+ def __init__(self, writer, row, start_date=None, end_date=None, use_rhn_date=True, whole_errata=False):
BaseRowDumper.__init__(self, writer, row)
self.start_date = start_date
self.end_date = end_date
self.use_rhn_date = use_rhn_date
+ self.whole_errata = whole_errata
def set_attributes(self):
channel_id = self._row['id']
@@ -323,10 +324,39 @@ class _ChannelDumper(BaseRowDumper):
and rp.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""")
+ _query_get_package_ids_by_date_limits_whole_errata = rhnSQL.Statement("""
+ select rcp.package_id as id
+ from rhnPackage rp, rhnChannelPackage rcp,
+ rhnErrataPackage rep, rhnErrata re
+ where rcp.channel_id = :channel_id
+ and rcp.package_id = rp.id
+ and rp.id = rep.package_id
+ and rep.errata_id = re.id
+ and re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ """)
+
+ _query_get_package_ids_by_rhndate_limits_whole_errata = rhnSQL.Statement("""
+ select rcp.package_id as id
+ from rhnPackage rp, rhnChannelPackage rcp,
+ rhnErrataPackage rep, rhnErrata re
+ where rcp.channel_id = :channel_id
+ and rcp.package_id = rp.id
+ and rp.id = rep.package_id
+ and rep.errata_id = re.id
+ and re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
+ """)
+
# Things that can be overwriten in subclasses
def _get_package_ids(self):
- return self._get_ids(self._query_get_package_ids_by_date_limits,
+ if self.start_date and self.whole_errata:
+ return self._get_ids(self._query_get_package_ids_by_date_limits_whole_errata,
+ self._query_get_package_ids_by_rhndate_limits_whole_errata,
+ self._query_get_package_ids)
+ else:
+ return self._get_ids(self._query_get_package_ids_by_date_limits,
self._query_get_package_ids_by_rhndate_limits,
self._query_get_package_ids)
12 years, 2 months
Changes to 'refs/tags/spacecmd-1.8.4-1'
by aparsons
Tag 'spacecmd-1.8.4-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2012-04-14 23:33 +0000
Tagging package [spacecmd] version [1.8.4-1] in directory [spacecmd/].
Changes since spacewalk-java-1.8.45-1:
Aron Parsons (3):
spacecmd: cosmetics
spacecmd: pretty-print JSON output
Automatic commit of package [spacecmd] release [1.8.4-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/utils.py | 9 ++++++---
3 files changed, 12 insertions(+), 5 deletions(-)
---
12 years, 2 months
3 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/utils.py | 9 ++++++---
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit e2d83a06c82924faa9b30d017556ec5c3c57dfb5
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sat Apr 14 19:33:37 2012 -0400
Automatic commit of package [spacecmd] release [1.8.4-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 308f552..f4b3713 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.8.3-1 spacecmd/
+1.8.4-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index dbdf696..3fc967b 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.8.3
+Version: 1.8.4
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -61,6 +61,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Sat Apr 14 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.4-1
+- spacecmd: pretty-print JSON output
+- spacecmd: cosmetics
+
* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.3-1
- 809905 - add option to allow templating for spacecmd kickstarting
(sherr(a)redhat.com)
commit b75c6fa85f7fb417b4b8e60eeb2bb27da6f72840
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sat Apr 14 19:25:47 2012 -0400
spacecmd: pretty-print JSON output
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 93fc1b5..628d9f2 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -596,12 +596,12 @@ def parse_api_args(args, sep=','):
return ret
-def json_dump(obj, fp, indent=2, **kwargs):
+def json_dump(obj, fp, indent = 4, **kwargs):
json.dump(obj, fp, ensure_ascii=False, indent=indent, **kwargs)
-def json_dump_to_file(obj, filename, indent = 2):
- json_data = json.dumps(obj, indent)
+def json_dump_to_file(obj, filename):
+ json_data = json.dumps(obj, indent = 4, sort_keys = True)
if json_data == None:
logging.error("Could not generate json data object!" % k)
commit 996d5e797b424e2b2da4ea854abebdd4c9030cf4
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sat Apr 14 19:19:34 2012 -0400
spacecmd: cosmetics
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 66ec32c..93fc1b5 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -599,12 +599,14 @@ def parse_api_args(args, sep=','):
def json_dump(obj, fp, indent=2, **kwargs):
json.dump(obj, fp, ensure_ascii=False, indent=indent, **kwargs)
-def json_dump_to_file(obj, filename, indent = 2):
+def json_dump_to_file(obj, filename, indent = 2):
json_data = json.dumps(obj, indent)
+
if json_data == None:
logging.error("Could not generate json data object!" % k)
return False
+
try:
fd = open(filename, 'w')
fd.write(json_data)
@@ -617,6 +619,7 @@ def json_dump_to_file(obj, filename, indent = 2):
return True
+
def json_read_from_file(filename):
try:
data = open(filename).read()
12 years, 2 months
Changes to 'refs/tags/spacewalk-java-1.8.45-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.45-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-13 15:53 +0000
Tagging package [spacewalk-java] version [1.8.45-1] in directory [java/].
Changes since spacewalk-backend-1.8.16-1:
Tomas Lestach (2):
809579 - make system snapshot when changing server entitlements using API
Automatic commit of package [spacewalk-java] release [1.8.45-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 17 ++++++++++
java/spacewalk-java.spec | 9 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 26 insertions(+), 2 deletions(-)
---
12 years, 2 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 38006c3a231db4e730ccaa104684cbd1624decb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 13 17:53:08 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.45-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 958927a..4067f69 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.44
+Version: 1.8.45
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Apr 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.45-1
+- 809579 - make system snapshot when changing server entitlements using API
+ (tlestach(a)redhat.com)
+- 812053 - change the condition (tlestach(a)redhat.com)
+- print extra stack trace (tlestach(a)redhat.com)
+- 804665 - do not scrub search_string (tlestach(a)redhat.com)
+
* Fri Apr 13 2012 Jan Pazdziora 1.8.44-1
- Fixing checkstyle.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 97ecb6d..3a5bd77 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.44-1 java/
+1.8.45-1 java/
12 years, 2 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 17 ++++++++++
1 file changed, 17 insertions(+)
New commits:
commit ca2274492a75db66e05e99e8a83f3feac7cd5694
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 13 17:32:48 2012 +0200
809579 - make system snapshot when changing server entitlements using API
system.addEntitlements
system.removeEntitlements
system.upgradeEntitlement
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index e64ee9f..3aabcad 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -296,6 +296,8 @@ public class SystemHandler extends BaseHandler {
}
SystemManager.entitleServer(server, entitlement);
+ SystemManager.snapshotServer(server, LocalizationService.getInstance()
+ .getMessage("snapshots.entitlements"));
return 1;
}
@@ -3604,6 +3606,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int addEntitlements(String sessionKey, Integer serverId, List entitlements) {
+ boolean needsSnapshot = false;
User loggedInUser = getLoggedInUser(sessionKey);
Server server = null;
try {
@@ -3656,6 +3659,7 @@ public class SystemHandler extends BaseHandler {
if (SystemManager.canEntitleServer(server, ent)) {
ValidatorResult vr = SystemManager.entitleServer(server, ent);
+ needsSnapshot = true;
if (vr.getErrors().size() > 0) {
throw new InvalidEntitlementException();
}
@@ -3665,6 +3669,11 @@ public class SystemHandler extends BaseHandler {
}
}
+ if (needsSnapshot) {
+ SystemManager.snapshotServer(server, LocalizationService
+ .getInstance().getMessage("snapshots.entitlements"));
+ }
+
return 1;
}
@@ -3684,6 +3693,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype #return_int_success()
*/
public int removeEntitlements(String sessionKey, Integer serverId, List entitlements) {
+ boolean needsSnapshot = false;
User loggedInUser = getLoggedInUser(sessionKey);
Server server = null;
try {
@@ -3705,12 +3715,19 @@ public class SystemHandler extends BaseHandler {
continue;
}
SystemManager.removeServerEntitlement(server.getId(), ent);
+ needsSnapshot = true;
}
// process base entitlements at the end
if (!baseEnts.isEmpty()) {
// means unentile the whole system
SystemManager.removeAllServerEntitlements(server.getId());
+ needsSnapshot = true;
+ }
+
+ if (needsSnapshot) {
+ SystemManager.snapshotServer(server, LocalizationService
+ .getInstance().getMessage("snapshots.entitlements"));
}
return 1;
12 years, 2 months
Changes to 'refs/tags/spacewalk-backend-1.8.16-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 14:44 +0000
Tagging package [spacewalk-backend] version [1.8.16-1] in directory [backend/].
Changes since spacewalk-java-1.8.44-1:
Jan Pazdziora (7):
812329 - The /etc/tnsnames.ora file might not exists.
812329 - add sudoers.d to the debug, there can be important information there.
812329 - the key variables are not used at all -- just print out everything we got.
812329 - make rhn-charsets working on PostgreSQL as well; the output format changed even for Oracle.
812329 - updating rhn-charsets man page -- update list of value names, no command line options.
812329 - adding PostgreSQL configuration and log files to the debug.
Automatic commit of package [spacewalk-backend] release [1.8.16-1].
Shannon Hughes (1):
811990 - refresh proxy auth cache for hostname changes
Stephen Herr (1):
Broken link patch submitted on behalf of Michael Calmer
Tomas Lestach (3):
804665 - do not scrub search_string
print extra stack trace
812053 - change the condition
---
backend/satellite_tools/rhn-charsets | 108 +---------
backend/satellite_tools/rhn-charsets.sgml | 29 --
backend/satellite_tools/spacewalk-debug | 18 +
backend/spacewalk-backend.spec | 12 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2
java/code/webapp/WEB-INF/struts-config.xml | 2
proxy/proxy/rhnProxyAuth.py | 3
rel-eng/packages/spacewalk-backend | 2
web/html/network/systems/system_list | 4
10 files changed, 48 insertions(+), 133 deletions(-)
---
12 years, 2 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit dc0e16ed1ea09b41b89c71dafaa135de95cbdd15
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 16:44:23 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4733b41..b7cf687 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.15
+Version: 1.8.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -673,6 +673,16 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Apr 13 2012 Jan Pazdziora 1.8.16-1
+- 812329 - adding PostgreSQL configuration and log files to the debug.
+- 812329 - updating rhn-charsets man page -- update list of value names, no
+ command line options.
+- 812329 - make rhn-charsets working on PostgreSQL as well; the output format
+ changed even for Oracle.
+- 812329 - add sudoers.d to the debug, there can be important information
+ there.
+- 812329 - The /etc/tnsnames.ora file might not exists.
+
* Fri Apr 13 2012 Jan Pazdziora 1.8.15-1
- With cobbler 2.2 landing in EPEL 5, we need to move to mod_wsgi with
Spacewalk backend even on RHEL 5.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ad669af..f0d55a8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.15-1 backend/
+1.8.16-1 backend/
12 years, 2 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/rhn-charsets.sgml | 29 ++---------------------------
backend/satellite_tools/spacewalk-debug | 8 ++++++++
2 files changed, 10 insertions(+), 27 deletions(-)
New commits:
commit 42e75e6b97782cb6f31d096f99d48a0fccd8b712
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 16:31:03 2012 +0200
812329 - adding PostgreSQL configuration and log files to the debug.
diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug
index 506fba0..733ad99 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -221,6 +221,14 @@ fi
ls /rhnsat/admin/rhnsat/bdump/*.trc 2>/dev/null | xargs -I file cp -fa file $DIR/database
ls /rhnsat/admin/rhnsat/logs/*.log 2>/dev/null | xargs -I file cp -fa file $DIR/database
+# PostgreSQL logs
+if [ -f /var/lib/pgsql/pgstartup.log ] ; then
+ echo " * copying pgstartup.log"
+ cp -fa /var/lib/pgsql/pgstartup.log $DIR/database
+fi
+
+ls /var/lib/pgsql/data/*.conf /var/lib/pgsql/data/pg_log/* 2>/dev/null | xargs -I file cp -fa file $DIR/database
+
if [ -d /var/log/spacewalk/schema-upgrade ] ; then
echo " * copying schema upgrade logs"
mkdir -p $DIR/schema-upgrade-logs
commit 6fa6ed4adf1e47b205f54c9ab94c87179166d5ec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Apr 13 16:30:02 2012 +0200
812329 - updating rhn-charsets man page -- update list of value names, no command line options.
diff --git a/backend/satellite_tools/rhn-charsets.sgml b/backend/satellite_tools/rhn-charsets.sgml
index b8989e0..5fd5853 100644
--- a/backend/satellite_tools/rhn-charsets.sgml
+++ b/backend/satellite_tools/rhn-charsets.sgml
@@ -21,13 +21,6 @@ Fetch the database characterset types for an &RHNSAT;.
<Synopsis>
<cmdsynopsis>
<command>&COMMAND;</command>
- <arg>options <replaceable>...</replaceable></arg>
- </cmdsynopsis>
- <cmdsynopsis>
- <arg>--db <replaceable>USERNAME/PASSWORD@SID</replaceable></arg>
- </cmdsynopsis>
- <cmdsynopsis>
- <arg>-h</arg> <arg>--help</arg>
</cmdsynopsis>
</Synopsis>
</RefSynopsisDiv>
@@ -35,30 +28,12 @@ Fetch the database characterset types for an &RHNSAT;.
<RefSect1><Title>Description</Title>
<para> <emphasis>&COMMAND;</emphasis> fetches the database characterset
- ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET') values for an &RHNSAT;. By
- default it uses the database connection string found in /etc/rhn/rhn.conf.
+ ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET', 'server_encoding', 'client_encoding')
+ values for an &RHNSAT;. It uses the database connection string found in /etc/rhn/rhn.conf.
</para>
</RefSect1>
-<RefSect1><Title>Options</Title>
-<variablelist>
- <varlistentry>
- <term>-h, --help</term>
- <listitem>
- <para>Display the help screen with a list of options.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>--db <replaceable>USERNAME/PASSWORD@SID</replaceable></term>
- <listitem>
- <para>alternative database string. Default value is the DEFAULT_DB
- setting in /etc/rhn/rhn.conf</para>
- </listitem>
- </varlistentry>
-</variablelist>
-</RefSect1>
-
<RefSect1><Title>Files</Title>
<simplelist>
<member>/etc/rhn/rhn.conf</member>
12 years, 2 months