Branch 'ipv6' - backend/server
by Miroslav Suchý
backend/server/rhnServer/server_hardware.py | 43 +++++++---------------------
1 file changed, 11 insertions(+), 32 deletions(-)
New commits:
commit 115a7ecd22f6c9d7cde472a2b575ccf5d85c36be
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 25 16:33:51 2011 +0200
__load_from_db: load devices using its method save()
this will put _auto_null and other stuff in game
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index dd044e1..9858c67 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -703,29 +703,13 @@ class Hardware:
self.__changed = 0
return 0
- def __load_from_db(self, db, DevClass, sysid):
+ def __load_from_db(self, DevClass, sysid):
""" Load a certain hardware class from the database """
if not self.__hardware.has_key(DevClass):
self.__hardware[DevClass] = []
-
- h = rhnSQL.prepare("select * from %s where server_id = :sysid" % db)
- h.execute(sysid = sysid)
- rows = h.fetchall_dict() or []
-
- for device in rows:
- dev_id = device['id']
-
- # get rid of the keys we do not support
- for k in ["server_id", "created", "modified", "id"]:
- if device.has_key(k):
- del device[k]
- dev = DevClass(device)
-
- # we know better
- dev.id = dev_id
- dev.status = 0
- self.__hardware[DevClass].append(dev)
- return 0
+ dev = DevClass()
+ dev.reload(sysid)
+ self.__hardware[DevClass].append(dev)
def reload_hardware_byid(self, sysid):
""" load all hardware devices for a server """
@@ -734,18 +718,13 @@ class Hardware:
return -1
self.__hardware = {} # discard what was already loaded
# load from all hardware databases
- self.__load_from_db("rhnDevice", HardwareDevice, sysid)
- self.__load_from_db("rhnCPU", CPUDevice, sysid)
- self.__load_from_db("rhnServerDMI", DMIInformation, sysid)
- self.__load_from_db("rhnServerNetwork", NetworkInformation, sysid)
- self.__load_from_db("rhnRAM", MemoryInformation, sysid)
- self.__load_from_db("rhnServerInstallInfo", InstallInformation, sysid)
-
- net_iface_info = NetIfaceInformation()
- net_iface_info.reload(sysid)
-
- self.__hardware[NetIfaceInformation] = []
- self.__hardware[NetIfaceInformation].append(net_iface_info)
+ self.__load_from_db(HardwareDevice, sysid)
+ self.__load_from_db(CPUDevice, sysid)
+ self.__load_from_db(DMIInformation, sysid)
+ self.__load_from_db(NetworkInformation, sysid)
+ self.__load_from_db(MemoryInformation, sysid)
+ self.__load_from_db(InstallInformation, sysid)
+ self.__load_from_db(NetIfaceInformation, sysid)
# now set the flag
self.__changed = 0
12 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 902c2b06339ca736c68223c4af8a4db6688e3031
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 25 16:01:11 2011 +0200
737838 - allow org admins to unschedule repo sync (org tasks)
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
index 036f8b1..865d5b9 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.taskomatic;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -137,6 +138,12 @@ public class TaskomaticApi {
}
}
+ private void ensureOrgAdminRole(User user) {
+ if (!user.hasRole(RoleFactory.ORG_ADMIN)) {
+ throw new PermissionException(RoleFactory.ORG_ADMIN);
+ }
+ }
+
/**
* Creates a new schedule, unschedules, if en existing is defined
* @param user shall be sat admin
@@ -167,7 +174,7 @@ public class TaskomaticApi {
}
private void unscheduleTask(String jobLabel, User user) {
- ensureSatAdminRole(user);
+ ensureOrgAdminRole(user);
invoke("tasko.unscheduleBunch", user.getOrg().getId(), jobLabel);
}
12 years, 6 months
Branch 'ipv6' - schema/spacewalk
by Miroslav Suchý
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f12ef56ddf5d0078881563be2194e7235ba3128e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 25 15:42:12 2011 +0200
add oracle equivalent
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
index a1f7aca..cce5d1c 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
@@ -1,3 +1,4 @@
+-- oracle equivalent source sha1 6e90408fc4c3d072bf407d0eb18962e46cb6a860
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
12 years, 6 months
Branch 'ipv6' - schema/spacewalk
by Miroslav Suchý
schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql | 3 ++
schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql | 6 +++--
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.oracle | 12 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql | 12 ++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
New commits:
commit fe27c552e304b9d0f842b9e35cb4bfb8df046494
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 24 15:50:36 2011 +0200
insert id from sequence using trigger
diff --git a/schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql b/schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql
index da0bb65..3c6cd27 100644
--- a/schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql
+++ b/schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql
@@ -19,6 +19,9 @@ rhn_srv_net_iface_mod_trig
before insert or update on rhnServerNetInterface
for each row
begin
+ if :new.id is null then
+ select rhn_srv_net_iface_id_seq.nextval into :new.id from dual;
+ end if;
:new.modified := sysdate;
end;
/
diff --git a/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql b/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
index 349810c..f803977 100644
--- a/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
+++ b/schema/spacewalk/postgres/triggers/rhnServerNetInterface.sql
@@ -1,8 +1,10 @@
--- oracle equivalent source sha1 d37db54a176f593bd9727921ed20d00d6cd95f4b
--- retrieved from ./1241102873/cdc6d42049bf86fbc9f1d3a5c54275eeacbd641d/schema/spacewalk/oracle/triggers/rhnServerNetInterface.sql
+-- oracle equivalent source sha1 1c9678fc0e82b0d0e1f659358120c971bc9bda20
create or replace function rhn_srv_net_iface_mod_trig_fun() returns trigger as
$$
begin
+ if new.id is null then
+ new.id := nextval('rhn_srv_net_iface_id_seq');
+ end if;
new.modified := current_timestamp;
return new;
end;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.oracle
new file mode 100644
index 0000000..1c25230
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.oracle
@@ -0,0 +1,12 @@
+create or replace trigger
+rhn_srv_net_iface_mod_trig
+before insert or update on rhnServerNetInterface
+for each row
+begin
+ if :new.id is null then
+ select rhn_srv_net_iface_id_seq.nextval into :new.id from dual;
+ end if;
+ :new.modified := sysdate;
+end;
+/
+show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
new file mode 100644
index 0000000..081faca
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/123-trigger-rhnServerNetInterface.sql.postgresql
@@ -0,0 +1,12 @@
+-- oracle equivalent source sha1 a3c3cb4940f2e96320a833521f352b83ddddaed1
+create or replace function rhn_srv_net_iface_mod_trig_fun() returns trigger as
+$$
+begin
+ if new.id is null then
+ new.id := nextval('rhn_srv_net_iface_id_seq');
+ end if;
+ new.modified := current_timestamp;
+ return new;
+end;
+$$ language plpgsql;
+
12 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit db2a5b89b1e425f7bae5958c46a9440f18b78224
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 25 15:34:18 2011 +0200
692357 - clone also kernel and kernel post options when cloning a ks profile
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
index 684614c..d91a93f 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java
@@ -67,6 +67,8 @@ public class KickstartCloneCommand extends BaseKickstartCommand {
cloned.setVirtFileSize(((Integer) original.getVirtFileSize()));
cloned.setVirtBridge(original.getVirtBridge());
cloned.setVirtPath(original.getVirtBridge());
+ cloned.setKernelOptions(original.getKernelOptions());
+ cloned.setKernelPostOptions(original.getKernelPostOptions());
cloned.save();
return null;
12 years, 6 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0005d41368a0770c4539fb9c46aa818121ea0a5c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 25 13:55:51 2011 +0200
DISTINCT is equivalent to UNIQUE.
Addressing
ERROR com.redhat.rhn.common.db.datasource.CachedStatement - Error while processing cached statement sql: select unique c.id,
c.label,
c.name,
[...]
and rhn_channel.loose_user_role_check(c.id, ?,
'subscribe') = 1
com.redhat.rhn.common.db.WrappedSQLException: ERROR: syntax error at or near "c"
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 28c0613..d04f5f5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -767,7 +767,7 @@ SELECT C.id, C.name, C.label, 1 AS IS_CUSTOM
<mode name="base_eus_channels_by_version_channel_arch"
class="com.redhat.rhn.frontend.dto.EssentialChannelDto">
<query params="product_name_label, version, channel_arch_id, user_id, org_id">
- select unique c.id,
+ select distinct c.id,
c.label,
c.name,
rcm.release,
12 years, 6 months
rel-eng/releasers.conf
by Jan Pazdziora
rel-eng/releasers.conf | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit b2d853d936282ff228b8a9d2edff60523275d2ae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 25 10:58:27 2011 +0200
Adding releasers.conf for the upcoming tito version.
diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf
new file mode 100644
index 0000000..be89eee
--- /dev/null
+++ b/rel-eng/releasers.conf
@@ -0,0 +1,3 @@
+[koji]
+releaser = spacewalkx.releasex.KojiReleaserGit
+autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate
12 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 6d89779cf6bdc69a8480e39efe7fd58624b3558a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 25 10:50:28 2011 +0200
726114 - allow macro delimiters in configchannel.createOrUpdatePath for directories
to behave according to the documentation: (ignored if working with a directory)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
index d4ddae9..4a388eb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java
@@ -382,10 +382,8 @@ public class ConfigChannelHandler extends BaseHandler {
validKeys.add(ConfigRevisionSerializer.PERMISSIONS);
validKeys.add(ConfigRevisionSerializer.REVISION);
validKeys.add(ConfigRevisionSerializer.SELINUX_CTX);
- if (!isDir) {
- validKeys.add(ConfigRevisionSerializer.MACRO_START);
- validKeys.add(ConfigRevisionSerializer.MACRO_END);
- }
+ validKeys.add(ConfigRevisionSerializer.MACRO_START);
+ validKeys.add(ConfigRevisionSerializer.MACRO_END);
validateMap(validKeys, data);
if (data.get(ConfigRevisionSerializer.SELINUX_CTX) == null) {
12 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.6.65-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.6.65-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-25 08:41 +0000
Tagging package [spacewalk-java] version [1.6.65-1] in directory [java/].
Changes since spacewalk-proxy-installer-1.6.6-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.6.65-1].
---
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
---
12 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 606a9ee62d0c3d7b773dae3edf33d3d6435040ba
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 25 10:41:46 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.65-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a0ef9af..b7cce5f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.64
+Version: 1.6.65
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 25 2011 Jan Pazdziora 1.6.65-1
+- 682845 - get rid of ChannelFactory.lookupContentSource(id) method without org
+ param (tlestach(a)redhat.com)
+- 682845 - get rid of ChannelFactory.lookupContentSource(label) method without
+ org param (tlestach(a)redhat.com)
+- Amending incorrect substitution from ee3623222bf. (slukasik(a)redhat.com)
+- 682845 - fix apidoc of repository related APIs (tlestach(a)redhat.com)
+- Do not hardcode config identifier, use defaults instead.
+ (slukasik(a)redhat.com)
+
* Mon Oct 24 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.64-1
- No need to have separate configuration per Tomcat's version
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fa499c0..094d9a6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.64-1 java/
+1.6.65-1 java/
12 years, 6 months