java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 12 ++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 7400ba5f68c312777c98ce942ec243859a76c86c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 25 18:16:24 2012 +0100
749476 - return default (empty) string instead of omitting the attribute for channel.software.getDetails API
fits better into the getDetails API concept
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index a3b1db2..2774e8f 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -90,10 +90,14 @@ public class ChannelSerializer implements XmlRpcCustomSerializer {
StringUtils.defaultString(c.getDescription()));
helper.add("checksum_label", c.getChecksumTypeLabel());
helper.add("last_modified", c.getLastModified());
- helper.add("maintainer_name", c.getMaintainerName());
- helper.add("maintainer_email", c.getMaintainerEmail());
- helper.add("maintainer_phone", c.getMaintainerPhone());
- helper.add("support_policy", c.getSupportPolicy());
+ helper.add("maintainer_name",
+ StringUtils.defaultString(c.getMaintainerName()));
+ helper.add("maintainer_email",
+ StringUtils.defaultString(c.getMaintainerEmail()));
+ helper.add("maintainer_phone",
+ StringUtils.defaultString(c.getMaintainerPhone()));
+ helper.add("support_policy",
+ StringUtils.defaultString(c.getSupportPolicy()));
helper.add("gpg_key_url",
StringUtils.defaultString(c.getGPGKeyUrl()));
12 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 74a52ee8516d24abbf90755937ad2c661cafb5bd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 25 15:50:15 2012 +0100
close session after initial taskorun check
diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
index daf7ca3..b1e5f71 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java
@@ -246,6 +246,7 @@ public class SchedulerKernel {
}
tx.commit();
}
+ TaskoFactory.closeSession();
}
}
}
12 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.7.20-1'
by Michael Mraka
Tag 'spacewalk-schema-1.7.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-01-25 12:38 +0000
Tagging package [spacewalk-schema] version [1.7.20-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.7.8-1:
Michael Mraka (2):
756918 - fix data for package_group
Automatic commit of package [spacewalk-schema] release [1.7.20-1].
---
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/spacewalk-schema.spec | 5 ++
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql | 18 ++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
---
12 years, 3 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 40eb4fe54ac13f65f4bc2ab4507278613640d158
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 25 13:38:59 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.7.20-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 02acfdf..a8223ac 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.7.19-1 schema/spacewalk/
+1.7.20-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index a06c17d..75110ee 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.7.19
+Version: 1.7.20
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Jan 25 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.20-1
+- 756918 - fix data for package_group
+
* Mon Jan 23 2012 Jan Pazdziora 1.7.19-1
- Dropping rhn_bl_obs_mod_trig_fun which was not dropped when
rhnBlacklistObsoletes was being removed.
12 years, 3 months
schema/spacewalk
by Michael Mraka
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql | 18 ++++++++++
1 file changed, 18 insertions(+)
New commits:
commit e8e976df476bc51ca95325f00c8d433428060dd7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 23 11:12:58 2012 +0100
756918 - fix data for package_group
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
index 4c42248..45acc5b 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/007-rhnPackageGroup-trim.sql
@@ -1,3 +1,21 @@
+-- relink reference to group with trailing \n to correct one
+update rhnpackage set package_group = (select n.id
+ from rhnpackagegroup n
+ join rhnpackagegroup o
+ on substr(o.name, 1, length(o.name)-1) = n.name
+ and o.id <> n.id
+ where o.id = package_group)
+ where package_group in (select o.id
+ from rhnpackagegroup n
+ join rhnpackagegroup o
+ on substr(o.name, 1, length(o.name)-1) = n.name
+ and o.id <> n.id);
+
+-- delete unused groups
+delete from rhnpackagegroup pg
+ where not exists (select 1 from rhnpackage p where p.package_group = pg.id)
+ and id > 1; -- don't remove 'NoGroup'
+
-- remove trailing \n
update rhnpackagegroup set name = substr(name, 1, length(name)-1)
where name like '%' || chr(10);
12 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.7.8-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.7.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-01-25 10:28 +0000
Tagging package [spacewalk-web] version [1.7.8-1] in directory [web/].
Changes since NPalert-1.126.28-1:
Jan Pazdziora (3):
Make it easier to subclass RHN::DB, use the $class which was passed in.
For DBD::Pg, just use its builtin ping, instead of doing SELECT.
Automatic commit of package [spacewalk-web] release [1.7.8-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB.pm | 27 +++++++++++----------------
web/spacewalk-web.spec | 6 +++++-
3 files changed, 17 insertions(+), 18 deletions(-)
---
12 years, 3 months
3 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB.pm | 27 +++++++++++----------------
web/spacewalk-web.spec | 6 +++++-
3 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 2cd090632c8a5e04230ca84e3a8d0ca45baa6380
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 25 11:28:39 2012 +0100
Automatic commit of package [spacewalk-web] release [1.7.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 05e997d..f9b12b0 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.7.7-1 web/
+1.7.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 974093e..6a688e8 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.7.7
+Version: 1.7.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Jan 25 2012 Jan Pazdziora 1.7.8-1
+- For DBD::Pg, just use its builtin ping, instead of doing SELECT.
+- Make it easier to subclass RHN::DB, use the $class which was passed in.
+
* Mon Jan 23 2012 Jan Pazdziora 1.7.7-1
- 783223 - fixing sysdate issue in rhn-enable-monitoring.pl.
- Show Proxy tabs on Spacewalk (msuchy(a)redhat.com)
commit f73dfab9806b4cc49ce407175e8890474708c839
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 25 11:28:00 2012 +0100
For DBD::Pg, just use its builtin ping, instead of doing SELECT.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index cb734c1..ddddf93 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -394,18 +394,13 @@ sub ping {
$dbh = shift;
}
- eval {
- my $ping_query;
-
- # again, we only do different if the db explicitly is Pg, not if
- # it isn't just Oracle. defensive.
- if ($dbh->{Driver}->{Name} eq 'Pg' or $dbh->{Driver}->{Name} eq 'mysql' or $dbh->{Driver}->{Name} eq 'SQLite') {
- $ping_query = "SELECT 1 + 2";
- }
- else {
- $ping_query = "SELECT 1 + 2 FROM DUAL";
+ my $ret = eval {
+ if ($dbh->{Driver}->{Name} eq 'Pg') {
+ return $dbh->SUPER::ping();
}
+ my $ping_query = "SELECT 1 + 2 FROM DUAL";
+
my $sth = $dbh->prepare_cached($ping_query);
return 0 unless $sth;
return 0 unless $sth->execute;
@@ -421,7 +416,7 @@ sub ping {
return 0;
}
else {
- return 1;
+ return $ret;
}
}
commit 201464dc9892f3f0b25f98588d1be2612b106778
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 25 10:36:30 2012 +0100
Make it easier to subclass RHN::DB, use the $class which was passed in.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 10337ff..cb734c1 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -84,8 +84,8 @@ sub apache_child_init_handler {
my @aliases = @_ ? @_ : ($RHN::DB::default_handle);
for my $alias (@aliases) {
- if (RHN::DB->lookup_alias($alias)) {
- RHN::DB->connect($alias);
+ if ($class->lookup_alias($alias)) {
+ $class->connect($alias);
}
}
}
@@ -144,7 +144,7 @@ sub connect {
# TODO: Once upon a time these aliases were just Oracle dsn's, if the incoming
# alias is in this format, convert it to an Oracle dbi string?
- $alias ||= ($RHN::DB::default_connection ||= RHN::DB->get_dbi_connection_string(
+ $alias ||= ($RHN::DB::default_connection ||= $class->get_dbi_connection_string(
PXT::Config->get("db_backend"),
PXT::Config->get("db_host"),
PXT::Config->get("db_port"),
@@ -168,10 +168,10 @@ sub connect {
$ENV{NLS_LANG} = $nls_lang;
}
- RHN::DB->add_alias($alias, PXT::Config->get("db_user"),
+ $class->add_alias($alias, PXT::Config->get("db_user"),
PXT::Config->get("db_password"), { });
- my $alias_data = RHN::DB->lookup_alias($alias);
+ my $alias_data = $class->lookup_alias($alias);
Carp::croak "RHN::DB->connect($alias): No such alias '$alias'" unless $alias_data;
my $params;
12 years, 3 months
Changes to 'refs/tags/NPalert-1.126.28-1'
by Jan Pazdziora
Tag 'NPalert-1.126.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-01-24 16:20 +0000
Tagging package [NPalert] version [1.126.28-1] in directory [monitoring/NPalert/].
Changes since spacewalk-backend-1.7.9-1:
Jan Pazdziora (2):
When we rollback before going to sleep, we won't keep transaction active.
Automatic commit of package [NPalert] release [1.126.28-1].
---
monitoring/NPalert/NPalert.spec | 5 ++++-
monitoring/NPalert/scripts/generate-config | 11 ++++-------
rel-eng/packages/NPalert | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
---
12 years, 3 months
monitoring/NPalert rel-eng/packages
by Jan Pazdziora
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 739267517cd0d8153ddf9129573c38afa29a3efe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 24 17:20:37 2012 +0100
Automatic commit of package [NPalert] release [1.126.28-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index aa0b7fd..26834db 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.27
+Version: 1.126.28
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -137,6 +137,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 24 2012 Jan Pazdziora 1.126.28-1
+- When we rollback before going to sleep, we won't keep transaction active.
+
* Mon Jan 16 2012 Miroslav Suchý 1.126.27-1
- Avoid using CURRENT_ALERTS_RECID_SEQ.NEXTVAL Oracle syntax.
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index 15d6896..cd05a7d 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.27-1 monitoring/NPalert/
+1.126.28-1 monitoring/NPalert/
12 years, 3 months
monitoring/NPalert
by Jan Pazdziora
monitoring/NPalert/scripts/generate-config | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 2f1f761518084cc29a32e3214dc615cad51a97ba
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 24 16:59:32 2012 +0100
When we rollback before going to sleep, we won't keep transaction active.
Addressing one <IDLE> in transaction.
diff --git a/monitoring/NPalert/scripts/generate-config b/monitoring/NPalert/scripts/generate-config
index 4debe5b..ab1e063 100755
--- a/monitoring/NPalert/scripts/generate-config
+++ b/monitoring/NPalert/scripts/generate-config
@@ -135,7 +135,6 @@ while (1) {
unless ($generate or $redir) {
$Log->log(3, "no config change...\n");
- sleep(SLEEP_INTERVAL);
next;
}
@@ -167,7 +166,6 @@ while (1) {
unless ($rv) {
¬ify("Preparation failed: $@");
- sleep(SLEEP_INTERVAL);
next;
}
@@ -177,7 +175,6 @@ while (1) {
$rv = &generate_config();
unless ($rv) {
¬ify("Generation failed: $@");
- sleep(SLEEP_INTERVAL);
next;
$@ = undef;
}
@@ -189,7 +186,6 @@ while (1) {
my $rv = &compile_config();
if ($rv) {
¬ify("Compile failed: $@");
- sleep(SLEEP_INTERVAL);
next;
}
}
@@ -201,10 +197,11 @@ while (1) {
} else {
$Log->log(1, "Done. Installed config.\n");
}
-
- # Don't kill the db or cpu
+}
+continue {
+ $ndb->rollback();
sleep(SLEEP_INTERVAL);
-} ## end while (1)
+}
#######################
# SUBROUTINES #
12 years, 3 months