Changes to 'refs/tags/rhnlib-2.5.43-1'
by Martin Minar
Tag 'rhnlib-2.5.43-1' created by Martin Minar <mminar(a)redhat.com> at 2011-08-09 07:13 +0000
Tagging package [rhnlib] version [2.5.43-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-reports-1.6.1-1:
Martin Minar (1):
Automatic commit of package [rhnlib] release [2.5.43-1].
---
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 10 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6c01d7ed4960e24e8902facfbe4e19a394b752d5
Author: Martin Minar <mminar(a)redhat.com>
Date: Tue Aug 9 09:13:54 2011 +0200
Automatic commit of package [rhnlib] release [2.5.43-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 9a6b750..f803289 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.42
+Version: 2.5.43
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Tue Aug 09 2011 Martin Minar <mminar(a)redhat.com> 2.5.43-1
+- 688095 - set timeout for HTTP connections (mzazrivec(a)redhat.com)
+
* Wed Jul 27 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.5.42-1
- import xmlrpclib directly
- removed unnecessary implicit imports
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 97d571c..8f459a3 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.42-1 client/rhel/rhnlib/
+2.5.43-1 client/rhel/rhnlib/
12 years, 10 months
Changes to 'refs/tags/spacewalk-reports-1.6.1-1'
by Jan Pazdziora
Tag 'spacewalk-reports-1.6.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-08 14:01 +0000
Tagging package [spacewalk-reports] version [1.6.1-1] in directory [reporting/].
Changes since spacewalk-web-1.6.9-1:
Jan Pazdziora (3):
New reports: errata-channels and kickstartable-trees.
Add the --where-<column-id> option to help and man page.
Automatic commit of package [spacewalk-reports] release [1.6.1-1].
Milan Zazrivec (1):
688095 - set timeout for HTTP connections
---
client/rhel/rhnlib/rhn/connections.py | 6 ++++-
rel-eng/packages/spacewalk-reports | 2 -
reporting/reports/data/errata-channels | 29 ++++++++++++++++++++++++++++
reporting/reports/data/kickstartable-trees | 30 +++++++++++++++++++++++++++++
reporting/spacewalk-report | 6 +++++
reporting/spacewalk-report.sgml | 10 +++++++++
reporting/spacewalk-reports.spec | 6 ++++-
7 files changed, 86 insertions(+), 3 deletions(-)
---
12 years, 10 months
rel-eng/packages reporting/spacewalk-reports.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit f9c9445c0895914c8e278c18536bac5815d047ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 8 16:01:57 2011 +0200
Automatic commit of package [spacewalk-reports] release [1.6.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 2f2f1f0..d72cf4c 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.5.4-1 reporting/
+1.6.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index c52f7eb..e9c8028 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.6.0
+Version: 1.6.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Mon Aug 08 2011 Jan Pazdziora 1.6.1-1
+- Add the --where-<column-id> option to help and man page.
+- New reports: errata-channels and kickstartable-trees.
+
* Tue Jul 19 2011 Jan Pazdziora 1.5.4-1
- Updating the copyright years.
12 years, 10 months
reporting/spacewalk-report reporting/spacewalk-report.sgml
by Jan Pazdziora
reporting/spacewalk-report | 6 ++++++
reporting/spacewalk-report.sgml | 10 ++++++++++
2 files changed, 16 insertions(+)
New commits:
commit 06bfa472ca81c21d07e1d5de97fbbf78995b7ea0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 8 15:55:06 2011 +0200
Add the --where-<column-id> option to help and man page.
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 583e615..333b443 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -63,6 +63,9 @@ def processCommandline():
Option('--list-fields-info', action='store_true',
dest='listfieldsinfo',
help='as --list-fields but also prints description for each column'),
+ Option('--where-<column-id>', action='store', metavar='VALUE',
+ dest='_where_trap',
+ help='limit the output to records where column-id has value VALUE'),
]
optionParser = OptionParser( \
@@ -89,6 +92,9 @@ def processCommandline():
del sys.argv[i]
i -= 2
+ if k == '<column-id>':
+ optionParser.error('use actual column-id in the --where-<column-id> parameter')
+
k = k.replace('-', '_')
if where.has_key(k):
where[k].append(v)
diff --git a/reporting/spacewalk-report.sgml b/reporting/spacewalk-report.sgml
index c48b70a..d9be02b 100644
--- a/reporting/spacewalk-report.sgml
+++ b/reporting/spacewalk-report.sgml
@@ -114,6 +114,16 @@ Generate reports from Spacewalk server in csv format
that field.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--where-<replaceable>column-id</replaceable>=<replaceable>VALUE</replaceable></term>
+ <listitem>
+ <para>Limit the output to records where column-id has value
+ VALUE. It can be used multiple times -- for the same column
+ it will select records where the column has any of the
+ VALUEs. When different columns are specified, all of them
+ have to meet the condition.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</RefSect1>
12 years, 10 months
reporting/reports
by Jan Pazdziora
reporting/reports/data/errata-channels | 29 ++++++++++++++++++++++++++++
reporting/reports/data/kickstartable-trees | 30 +++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
New commits:
commit 783a9108ae3ea1112c3d8475b7ecfa403523e49a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Aug 8 14:51:20 2011 +0200
New reports: errata-channels and kickstartable-trees.
diff --git a/reporting/reports/data/errata-channels b/reporting/reports/data/errata-channels
new file mode 100755
index 0000000..d294cd9
--- /dev/null
+++ b/reporting/reports/data/errata-channels
@@ -0,0 +1,29 @@
+
+synopsis:
+
+ List of erratas in channels
+
+description:
+
+ List of all erratas and their relation to channels.
+
+columns:
+
+ advisory Advisory / errata identifier
+ channel_label Channel label
+
+sql:
+
+
+ select advisory, channel_label
+ from (
+ select rhnErrata.advisory_name as advisory,
+ rhnErrata.id as errata_id,
+ rhnChannel.label as channel_label,
+ rhnChannel.id as channel_id
+ from rhnErrata, rhnChannelErrata, rhnChannel
+ where rhnErrata.id = rhnChannelErrata.errata_id
+ and rhnChannelErrata.channel_id = rhnChannel.id
+ ) X
+ -- where placeholder
+ order by advisory, errata_id, channel_label, channel_id
diff --git a/reporting/reports/data/kickstartable-trees b/reporting/reports/data/kickstartable-trees
new file mode 100755
index 0000000..7a2d5fc
--- /dev/null
+++ b/reporting/reports/data/kickstartable-trees
@@ -0,0 +1,30 @@
+
+synopsis:
+
+ List of kickstartable trees
+
+description:
+
+ List of all kickstartable trees.
+
+columns:
+
+ organization_id:i Organization identifier
+ channel_label Label of the channel
+ tree_label Kickstartable tree label
+ number_of_files:i Number of files in the kickstartable tree
+
+sql:
+
+ select organization_id, channel_label, tree_label, number_of_files
+ from (
+ select rhnKickstartableTree.org_id as organization_id,
+ rhnChannel.label as channel_label,
+ rhnKickstartableTree.label as tree_label,
+ ( select count(*) from rhnKSTreeFile where rhnKickstartableTree.id = rhnKSTreeFile.kstree_id ) as number_of_files,
+ rhnKickstartableTree.id
+ from rhnKickstartableTree, rhnChannel
+ where rhnKickstartableTree.channel_id = rhnChannel.id
+ ) X
+ -- where placeholder
+ order by organization_id, channel_label, tree_label, id
12 years, 10 months
client/rhel
by Milan Zazrivec
client/rhel/rhnlib/rhn/connections.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 6c2a93bcb7efa9873aee956f0cf7355177d4cc59
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Aug 8 12:15:13 2011 +0200
688095 - set timeout for HTTP connections
This would work only with python 2.6.1 and beyond (i.e. no RHEL-5 and friends).
diff --git a/client/rhel/rhnlib/rhn/connections.py b/client/rhel/rhnlib/rhn/connections.py
index 2f858f1..a33ce15 100644
--- a/client/rhel/rhnlib/rhn/connections.py
+++ b/client/rhel/rhnlib/rhn/connections.py
@@ -29,7 +29,11 @@ class HTTPConnection(httplib.HTTPConnection):
response_class = HTTPResponse
def __init__(self, host, port=None):
- httplib.HTTPConnection.__init__(self, host, port)
+ from platform import python_version
+ if python_version() >= '2.6.1':
+ httplib.HTTPConnection.__init__(self, host, port, timeout=SSL.DEFAULT_TIMEOUT)
+ else:
+ httplib.HTTPConnection.__init__(self, host, port)
self._cb_rs = []
self._cb_ws = []
self._cb_ex = []
12 years, 10 months
Changes to 'refs/tags/spacewalk-web-1.6.9-1'
by Michael Mraka
Tag 'spacewalk-web-1.6.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-08-08 10:17 +0000
Tagging package [spacewalk-web] version [1.6.9-1] in directory [web/].
Changes since spacewalk-java-1.6.18-1:
Michael Mraka (2):
fixed re-activation key in PostgreSQL
Automatic commit of package [spacewalk-web] release [1.6.9-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/Token.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 10 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e04e7d6ba7660aa05bb8fcdbd88f8e89bea7dd89
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 8 12:17:03 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.9-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 366d1f2..c2fb1fd 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.8-1 web/
+1.6.9-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 1f82ed5..e0bb945 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.8
+Version: 1.6.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Aug 08 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.9-1
+- fixed re-activation key in PostgreSQL
+
* Thu Aug 04 2011 Aron Parsons <aparsons(a)redhat.com> 1.6.8-1
- add support for custom messages in the header, footer and login pages
(aparsons(a)redhat.com)
12 years, 10 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/Token.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2cec4e439e2f64a75b5564656c3761d0a85357ce
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 8 12:12:17 2011 +0200
fixed re-activation key in PostgreSQL
applied patch from Robert Hernandez
fixing
RHN::Exception: DBD::Pg::st execute failed: ERROR: missing
FROM-clause entry for table "rhn_reg_token_seq" at character 8
RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 228
RHN::Exception::DB::throw
RHN::DB::Token /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB/Token.pm 430
RHN::DB::handle_error
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 9a9fb73..92a8333 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -426,7 +426,7 @@ sub commit {
my $dbh = $trans || RHN::DB->connect;
if ($self->id == -1) {
- my $sth = $dbh->prepare("SELECT rhn_reg_token_seq.nextval FROM DUAL");
+ my $sth = $dbh->prepare("SELECT sequence_nextval('rhn_reg_token_seq') FROM DUAL");
$sth->execute;
my ($id) = $sth->fetchrow;
die "No new token id from seq rhn_reg_token_seq (possible error: " . $sth->errstr . ")" unless $id;
12 years, 10 months