Changes to 'refs/tags/SatConfig-generator-2.29.13-1'
by Jan Pazdziora
Tag 'SatConfig-generator-2.29.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:01 +0000
Tagging package [SatConfig-generator] version [2.29.13-1] in directory [monitoring/SatConfig/generator/].
Changes since spacewalk-web-1.5.5-1:
Jan Pazdziora (1):
Automatic commit of package [SatConfig-generator] release [2.29.13-1].
---
monitoring/SatConfig/generator/SatConfig-generator.spec | 7 ++++++-
rel-eng/packages/SatConfig-generator | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 11 months
monitoring/SatConfig rel-eng/packages
by Jan Pazdziora
monitoring/SatConfig/generator/SatConfig-generator.spec | 7 ++++++-
rel-eng/packages/SatConfig-generator | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit de57d70c7b9615b954b4cd6a9bdd94a8bd3ac16d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:01:20 2011 +0200
Automatic commit of package [SatConfig-generator] release [2.29.13-1].
diff --git a/monitoring/SatConfig/generator/SatConfig-generator.spec b/monitoring/SatConfig/generator/SatConfig-generator.spec
index 8bb820f..db68593 100644
--- a/monitoring/SatConfig/generator/SatConfig-generator.spec
+++ b/monitoring/SatConfig/generator/SatConfig-generator.spec
@@ -2,7 +2,7 @@
%define install_prefix %{perl_vendorlib}/NOCpulse/SatConfig
Name: SatConfig-generator
-Version: 2.29.12
+Version: 2.29.13
Release: 1%{?dist}
Summary: Satellite Configuration System - Server
URL: https://fedorahosted.org/spacewalk
@@ -54,6 +54,11 @@ install -m 644 GenerateConfig.pm $RPM_BUILD_ROOT%{install_prefix}
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 02 2011 Jan Pazdziora 2.29.13-1
+- No need to Disconnect, hopefully.
+- Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses
+ RHN::DB, the column name is now uppercase.
+
* Fri Oct 08 2010 Jan Pazdziora 2.29.12-1
- Since the package SatConfig-dbsynch is gone, remove dependencies that were
requiring it.
diff --git a/rel-eng/packages/SatConfig-generator b/rel-eng/packages/SatConfig-generator
index a7c79e5..f1663c4 100644
--- a/rel-eng/packages/SatConfig-generator
+++ b/rel-eng/packages/SatConfig-generator
@@ -1 +1 @@
-2.29.12-1 monitoring/SatConfig/generator/
+2.29.13-1 monitoring/SatConfig/generator/
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.5-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:00 +0000
Tagging package [spacewalk-web] version [1.5.5-1] in directory [web/].
Changes since spacewalk-backend-1.5.14-1:
Jan Pazdziora (4):
Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses RHN::DB, the column name is now uppercase.
Fixing set_err invocation to match the prototype.
No need to Disconnect, hopefully.
Automatic commit of package [spacewalk-web] release [1.5.5-1].
---
monitoring/SatConfig/generator/GenerateConfig.pm | 6 ++----
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB.pm | 4 ++--
web/spacewalk-web.spec | 5 ++++-
4 files changed, 9 insertions(+), 8 deletions(-)
---
12 years, 11 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 81d5c5984d51fc4c5d87c1e1bd9bd071b654d802
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:00:42 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 2072ebd..c26a373 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.4-1 web/
+1.5.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0369162..bc01a03 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.4
+Version: 1.5.5
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 May 02 2011 Jan Pazdziora 1.5.5-1
+- Fixing set_err invocation to match the prototype.
+
* Mon May 02 2011 Jan Pazdziora 1.5.4-1
- Patch to run remote commands on multiple machines on Spacewalk 1.4
PostgreSQL. (Ville.Salmela(a)csc.fi)
12 years, 11 months
monitoring/SatConfig
by Jan Pazdziora
monitoring/SatConfig/generator/GenerateConfig.pm | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 44acf2b910e18accbe58e5d03f3c328009ad9501
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:57:56 2011 +0200
No need to Disconnect, hopefully.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: RHN::Exception: DBD::Oracle::db set_err failed: Can't disconnect cache-loaded RHN::DB handle
diff --git a/monitoring/SatConfig/generator/GenerateConfig.pm b/monitoring/SatConfig/generator/GenerateConfig.pm
index 1c27509..f7c77c7 100644
--- a/monitoring/SatConfig/generator/GenerateConfig.pm
+++ b/monitoring/SatConfig/generator/GenerateConfig.pm
@@ -107,7 +107,6 @@ sub synch_nolog {
my ($customer_id, $sat_cluster_id) = @_;
# Log in to the nolog instance
- NOCpulse::DBRecord->Disconnect();
CSDBRecord->DatabaseConnection();
my $sth;
@@ -153,7 +152,6 @@ sub synch_nolog {
} else {
CSDBRecord->DatabaseConnection->commit();
}
- NOCpulse::DBRecord->Disconnect();
return $msg;
}
12 years, 11 months
2 commits - monitoring/SatConfig web/modules
by Jan Pazdziora
monitoring/SatConfig/generator/GenerateConfig.pm | 4 ++--
web/modules/rhn/RHN/DB.pm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4a855ee10d5dd0527691dacec424896048563c5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:40:35 2011 +0200
Fixing set_err invocation to match the prototype.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: DBI set_err: invalid number of arguments: got handle + 1, expected handle + between 2 and 5
Usage: $h->set_err($err, $errmsg [, $state, $method, $rv]) at /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm line 373.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 6c60b7c..10337ff 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -370,7 +370,7 @@ sub disconnect {
my $dbh = shift;
if ($dbh->{private_from_cache}) {
- $dbh->set_err("Can't disconnect cache-loaded RHN::DB handle");
+ $dbh->set_err(99999, "Can't disconnect cache-loaded RHN::DB handle");
}
else {
$dbh->SUPER::disconnect(@_);
@@ -533,7 +533,7 @@ sub execute_h {
my $self = shift;
my @params = @_;
- $self->set_err("Odd number of params to execute_h") if @params % 2;
+ $self->set_err(99998, "Odd number of params to execute_h") if @params % 2;
while (my ($k, $v) = (splice @params, 0, 2, ())) {
commit dd69d8fe96a1337a65d8d645f9ecd0d9b05342d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:37:19 2011 +0200
Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses RHN::DB, the column name is now uppercase.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: Message SatClusterRecord::get_physical_location_name() not understood
TRACEBACK:
at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 443
NOCpulse::Object::doesNotUnderstand('SatClusterRecord=HASH(0x2aae515d6fc0)', 'SatClusterRecord', 'get_physical_location_name') called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 463
NOCpulse::Object::AUTOLOAD('SatClusterRecord=HASH(0x2aae515d6fc0)') called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 44
eval {...} called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 19
NOCpulse::SatConfig::GenerateConfig::handler('Apache2::RequestRec=SCALAR(0x2aae5a006a50)') called at -e line 0
eval {...} called at -e line 0
diff --git a/monitoring/SatConfig/generator/GenerateConfig.pm b/monitoring/SatConfig/generator/GenerateConfig.pm
index 46e2b66..1c27509 100644
--- a/monitoring/SatConfig/generator/GenerateConfig.pm
+++ b/monitoring/SatConfig/generator/GenerateConfig.pm
@@ -24,7 +24,7 @@ sub handler {
SatClusterRecord->LoadFromSqlWithBind(q{
select sat_cluster.recid, sat_cluster.customer_id,
- location_name "physical_location_name",
+ location_name as physical_location_name,
sat_node.max_concurrent_checks, sat_node.sched_log_level,
sat_node.sput_log_level, sat_node.dq_log_level
from sat_cluster, sat_node, physical_location
@@ -41,7 +41,7 @@ sub handler {
my $satCluster = SatClusterRecord->InstancesList->[0];
my $customerId = $satCluster->get_CUSTOMER_ID;
- my $location = $satCluster->get_physical_location_name;
+ my $location = $satCluster->get_PHYSICAL_LOCATION_NAME;
# Get the auto_update flag
CFDBRecord->LoadFromSqlWithBind(q{
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.14-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-02 14:00 +0000
Tagging package [spacewalk-backend] version [1.5.14-1] in directory [backend/].
Changes since yum-rhn-plugin-1.5.6-1:
Michael Mraka (3):
force version and release to be a string
701297 - don't try to read rpm header from mpm package
Automatic commit of package [spacewalk-backend] release [1.5.14-1].
---
backend/server/handlers/app/packages.py | 4 ++--
backend/server/importlib/packageImport.py | 4 +++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
---
12 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8757743f53642b95afc451b7e4cbe3ef68a8948f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 16:00:30 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e5ff4ea..01a5bb7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.13
+Version: 1.5.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
+- 701297 - don't try to read rpm header from mpm package
+
* Mon May 02 2011 Jan Pazdziora 1.5.13-1
- Method reload_packages not used in our code, removing.
- Removal of ReleaseChannelMapImport makes processReleaseChannelMap unused,
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 30d48b1..60cc880 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.13-1 backend/
+1.5.14-1 backend/
12 years, 11 months
2 commits - backend/server
by Michael Mraka
backend/server/handlers/app/packages.py | 4 ++--
backend/server/importlib/packageImport.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b561351b9a9e02fc4c279198462cd4e21ac0d733
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 15:53:27 2011 +0200
701297 - don't try to read rpm header from mpm package
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index effd477..f8f5bef 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -21,6 +21,7 @@ import os.path
from importLib import GenericPackageImport, IncompletePackage, \
Import, InvalidArchError, InvalidChannelError, \
IncompatibleArchError
+from mpmSource import mpmBinaryPackage
from spacewalk.common import rhn_pkg
from spacewalk.common.rhnConfig import CFG
from spacewalk.server import taskomatic
@@ -481,7 +482,8 @@ class PackageImport(ChannelPackageSubscription):
def _import_signatures(self):
for package in self.batch:
- if package['path']:
+ # skip missing files and mpm packages
+ if package['path'] and not isinstance(package, mpmBinaryPackage):
full_path = os.path.join(CFG.MOUNT_POINT, package['path'])
if os.path.exists(full_path):
header = rhn_pkg.get_package_header(filename=full_path)
commit b8e79b43306d0a80ac5130870a1b0521a24e1db0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sun May 1 22:07:32 2011 +0200
force version and release to be a string
fixing
operator does not exist: character varying = integer
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index e3aa1b1..7b24bb1 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -509,8 +509,8 @@ class Packages(RPC_Base):
query_args = {
'pkg_name': pkg_info['name'],
'pkg_epoch': pkg_epoch,
- 'pkg_version': pkg_info['version'],
- 'pkg_rel': pkg_info['release'],
+ 'pkg_version': str(pkg_info['version']),
+ 'pkg_rel': str(pkg_info['release']),
'pkg_arch': pkg_info['arch'],
'orgid': org_id,
}
12 years, 11 months
Changes to 'refs/tags/yum-rhn-plugin-1.5.6-1'
by Miroslav Suchý
Tag 'yum-rhn-plugin-1.5.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-02 12:31 +0000
Tagging package [yum-rhn-plugin] version [1.5.6-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-java-1.5.15-1:
Miroslav Suchý (3):
proxy_dict is private attribute
set proxy_dict only if we have some proxy
Automatic commit of package [yum-rhn-plugin] release [1.5.6-1].
---
client/rhel/yum-rhn-plugin/rhnplugin.py | 11 ++++++-----
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
---
12 years, 11 months