Branch 'ipv6' - 3 commits - backend/server
by Milan Zazrivec
backend/server/rhnServer/server_hardware.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit f1ef643c8ed6e67938d2a50864b7f5b63f8ecb0b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 16 14:52:07 2011 +0100
Add None in case IPv4 / IPv6 address is missing
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 747e69d..461a58a 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -740,6 +740,8 @@ def _transpose(hasharr):
for k in keys:
if hval.has_key(k):
result[k].append(hval[k])
+ else:
+ result[k].append(None)
return result
commit ba2aa473ad7db2db447ef6cd67283eac04cb8b36
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 16 09:09:31 2011 +0100
Typo fix
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 3488e48..747e69d 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -460,11 +460,11 @@ class NetIfaceInformation(Device):
if 'ipv6' in info:
iface['ipv6'].save(self.get_server_id(server_id, iface['name']))
else:
- pass # wipe old recoreds if any
+ pass # wipe old records if any
if 'ipv4' in info:
iface['ipv4'].save(self.get_server_id(server_id, iface['name']))
else:
- pass # wipe old recoreds if any
+ pass # wipe old records if any
return 0
def get_server_id(self, server_id, name):
commit 335771e0d0f71c688be95d9adabb99950d556cdd
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 16 09:06:48 2011 +0100
Typo fix
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index 4793c7d..3488e48 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -406,7 +406,7 @@ class NetIfaceInformation(Device):
else:
k = key
if not info.has_key(k):
- raise rhnFault(53, "Unable1 to find required field %s"
+ raise rhnFault(53, "Unable to find required field %s"
% key)
val = info[k]
vdict[mapping] = val
12 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.6.28-1'
by Tomas Lestach
Tag 'spacewalk-web-1.6.28-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-11-16 12:38 +0000
Tagging package [spacewalk-web] version [1.6.28-1] in directory [web/].
Changes since spacewalk-schema-1.6.28-1:
Tomas Lestach (2):
754379 - fix deletion-url in pxt pages
Automatic commit of package [spacewalk-web] release [1.6.28-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/network/components/systems/system_details_toolbar.pxi | 6 +++---
web/spacewalk-web.spec | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
---
12 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 160e9e5db1e855ecad28b68f5db4740ac93b9cb4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 16 13:38:23 2011 +0100
Automatic commit of package [spacewalk-web] release [1.6.28-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index dadc4b5..f51809d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.27-1 web/
+1.6.28-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f8f0477..ba09fcf 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.27
+Version: 1.6.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.28-1
+- 754379 - fix deletion-url in pxt pages (tlestach(a)redhat.com)
+
* Fri Nov 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.27-1
- removed aliases from SET part of UPDATE
12 years, 5 months
web/html
by Tomas Lestach
web/html/network/components/systems/system_details_toolbar.pxi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e3680049ee955aa666e1d93f1cb30e6fb567cb2b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Nov 16 13:37:38 2011 +0100
754379 - fix deletion-url in pxt pages
diff --git a/web/html/network/components/systems/system_details_toolbar.pxi b/web/html/network/components/systems/system_details_toolbar.pxi
index 0c00f7c..0d54619 100644
--- a/web/html/network/components/systems/system_details_toolbar.pxi
+++ b/web/html/network/components/systems/system_details_toolbar.pxi
@@ -8,7 +8,7 @@
<rhn-require acl="not system_is_virtual_host(); not system_is_virtual()">
<rhn-toolbar base="h1" img="/img/rhn-icon-system.gif"
alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid=?sid={formvar:sid}"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
deletion-type="system">
<rhn-server-name />
</rhn-toolbar>
@@ -17,7 +17,7 @@
<rhn-require acl="system_is_virtual_host()">
<rhn-toolbar base="h1" img="/img/virt-host.png"
alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid=?sid={formvar:sid}"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
deletion-type="system">
<rhn-server-name />
</rhn-toolbar>
@@ -26,7 +26,7 @@
<rhn-require acl="system_is_virtual()">
<rhn-toolbar base="h1" img="/img/virt-guest.png"
alt="system" help-url="s1-sm-systems.jsp#s3-sm-system-details"
- deletion-url="/rhn/systems/details/DeleteConfirm.do?sid=?sid={formvar:sid}"
+ deletion-url="/rhn/systems/details/DeleteConfirm.do?sid={formvar:sid}"
deletion-type="system">
<rhn-server-name />
</rhn-toolbar>
12 years, 5 months
Changes to 'refs/tags/spacewalk-schema-1.6.28-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.6.28-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-11-16 11:35 +0000
Tagging package [spacewalk-schema] version [1.6.28-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.6.40-1:
Milan Zazrivec (2):
pgsql: varchar2 -> varchar
Automatic commit of package [spacewalk-schema] release [1.6.28-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 5 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9de6c6f0ffd0495125894f21bd032065bc949817
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 16 12:35:57 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.28-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 43abb06..d40031e 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.27-1 schema/spacewalk/
+1.6.28-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index c48fa4b..d8bf4e7 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.6.27
+Version: 1.6.28
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Nov 16 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.28-1
+- pgsql: varchar2 -> varchar
+
* Fri Nov 04 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.27-1
- 679335 - store osa-dispatcher jabber password in DB
12 years, 5 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff557a7618a7477b89051343e20f92391a7cf9ce
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Nov 16 12:33:34 2011 +0100
pgsql: varchar2 -> varchar
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql
index c021cb6..c960bf4 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/124-rhnPushDispatcher.sql.postgresql
@@ -1,3 +1,3 @@
-- oracle equivalent source sha1 66bf4b1447a6fd90a219f5731196698edf7b3683
-alter table rhnPushDispatcher add password varchar2(32);
+alter table rhnPushDispatcher add password varchar(32);
12 years, 5 months
Branch 'ipv6' - backend/server
by Miroslav Suchý
backend/server/rhnServer/server_hardware.py | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 724fff86f95d671f8a3622015048d45a0936653b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 15 14:22:10 2011 +0100
do not call constructor in reload
a) it is already called in __load_from_db()
b) we change all attributes later in reload()
c) child of Device class has different parameters of constructor - they accept dictionary of params instead of name of table
addressing:
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 995, in refresh_hw_profile
server.delete_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 87, in delete_hardware
return Hardware.delete_hardware(self, self.server.get("id"))
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 876, in delete_hardware
self.reload_hardware_byid(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 923, in reload_hardware_byid
self.__load_from_db(HardwareDevice, sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 913, in __load_from_db
dev.reload(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 220, in reload
self.__init__(self.__table)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 315, in __init__
Device.__init__(self, "rhnDevice", fields, dict, mapping)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 271, in __init__
dict, mapping)
TypeError: ('Argument passed is not a dictionary', 'rhnDevice', {'desc': 'description'})
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index d6638d8..4793c7d 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -217,7 +217,6 @@ class GenericDevice:
""" reload from rhnDevice table based on devid """
if not devid:
return -1
- self.__init__(self.__table)
t = rhnSQL.Table(self.__table, "id")
self.data = t[devid]
# clean up fields we don't want
12 years, 5 months
Branch 'ipv6' - backend/server
by Milan Zazrivec
backend/server/rhnServer/server_hardware.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4090336a8b824e5c730ffcd503d2f9ac07adfb64
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 15 15:58:17 2011 +0100
fix registration TB
In case some of the NICs does not have an IPv4 address set, following error would occur:
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 123, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 984, in add_hw_profile
server.save_hardware()
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 90, in save_hardware
ret = self.save_hardware_byid(self.server["id"])
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 892, in save_hardware_byid
hw.save(sysid)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 458, in save
self._insert(inserts)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 490, in _insert
return _dml(h, params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 726, in _dml
params = _transpose(params)
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnServer/server_hardware.py", line 742, in _transpose
result[k].append(hval[k])
KeyError: 'ipv4'
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index fd55e81..d6638d8 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -739,7 +739,8 @@ def _transpose(hasharr):
for hval in hasharr:
for k in keys:
- result[k].append(hval[k])
+ if hval.has_key(k):
+ result[k].append(hval[k])
return result
12 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.6.40-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.6.40-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-15 13:50 +0000
Tagging package [spacewalk-backend] version [1.6.40-1] in directory [backend/].
Changes since spacewalk-backend-1.6.39-1:
Miroslav Suchý (2):
move common code to common function __add_hw_profile_no_auth()
Automatic commit of package [spacewalk-backend] release [1.6.40-1].
---
backend/server/handlers/xmlrpc/registration.py | 20 +++++++++-----------
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
---
12 years, 5 months