web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit d64ea81ab324d8d7bd3211093d03267f3dcbbb73
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 12 11:24:52 2011 +0200
removed unnecessary join
well, rhnVisServerGroupMembership.group_type already is
rhnServerGroupType.label so no need to join the table again, moreover condition
group_type (aka group label) = id is completely wrong
fixing numeric vs. varchar issue
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
index c928831..a26e1d8 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -115,13 +115,11 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<query params="sid, org_id, user_id">
SELECT VSGM.group_id AS ID,
SG.name AS GROUP_NAME,
- SGT.label AS GROUP_TYPE_LABEL,
+ VSGM.group_type AS GROUP_TYPE_LABEL,
(SELECT 1 FROM rhnUserServerGroupPerms WHERE user_id = :user_id AND server_group_id = SG.id) AS USER_PERMITTED_ACCESS
FROM
rhnServerGroup SG,
- rhnVisServerGroupMembership VSGM
- LEFT JOIN rhnServerGroupType SGT
- ON VSGM.group_type = SGT.id,
+ rhnVisServerGroupMembership VSGM,
rhnUserServerGroupPerms USGP
WHERE VSGM.org_id = :org_id
AND VSGM.server_id = :sid
12 years, 8 months
Changes to 'refs/tags/rhn-virtualization-5.4.25-1'
by Miroslav Suchý
Tag 'rhn-virtualization-5.4.25-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-08-12 06:50 +0000
Tagging package [rhn-virtualization] version [5.4.25-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-java-1.6.20-1:
Miroslav Suchý (3):
None has not iteritems() method
fix syntax errors
Automatic commit of package [rhn-virtualization] release [5.4.25-1].
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/domain_control.py | 2 +-
client/tools/rhn-virtualization/virtualization/poller.py | 2 +-
client/tools/rhncfg/config_common/local_config.py | 7 ++++---
rel-eng/packages/rhn-virtualization | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
---
12 years, 8 months
3 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
client/tools/rhn-virtualization/virtualization/domain_control.py | 2 +-
client/tools/rhn-virtualization/virtualization/poller.py | 2 +-
client/tools/rhncfg/config_common/local_config.py | 7 ++++---
rel-eng/packages/rhn-virtualization | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit df7fcf026b5e41ad17ff2080f4a5e613c61aad48
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 12 08:50:57 2011 +0200
Automatic commit of package [rhn-virtualization] release [5.4.25-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index fb6fbb8..5db2bc7 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.24
+Version: 5.4.25
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Aug 12 2011 Miroslav Suchý 5.4.25-1
+- fix syntax errors
+
* Thu Aug 11 2011 Miroslav Suchý 5.4.24-1
- do not mask original error by raise in execption
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index 7c4d42c..9c52891 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.24-1 client/tools/rhn-virtualization/
+5.4.25-1 client/tools/rhn-virtualization/
commit 7f2e37ae904faf4963bc948a03d9080ef3ae5893
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Aug 12 08:46:52 2011 +0200
fix syntax errors
diff --git a/client/tools/rhn-virtualization/virtualization/domain_control.py b/client/tools/rhn-virtualization/virtualization/domain_control.py
index aa98238..535ec22 100755
--- a/client/tools/rhn-virtualization/virtualization/domain_control.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_control.py
@@ -117,7 +117,7 @@ def _get_domain(uuid):
domain = conn.lookupByUUIDString(hyphenized_uuid)
except libvirt.libvirtError, lve:
raise VirtualizationException, \
- "Domain UUID '%s' not found: %s", (hyphenized_uuid, str(lve)), None, sys.exc_info()[2]
+ "Domain UUID '%s' not found: %s" (hyphenized_uuid, str(lve)), sys.exc_info()[2]
return (conn, domain)
def _call_domain_control_routine(uuid, routine_name, *args):
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py
index 5bde130..8b96f0d 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -92,7 +92,7 @@ def poll_hypervisor():
except libvirt.libvirtError, lve:
raise VirtualizationException, \
"Failed to obtain handle to domain %d: %s" % \
- (domainID, repr(lve)), None, sys.exc_info()[2]
+ (domainID, repr(lve)), sys.exc_info()[2]
uuid = binascii.hexlify(domain.UUID())
# SEE: http://libvirt.org/html/libvirt-libvirt.html#virDomainInfo
commit 3d7a45f46f39f90b509699374da188a0ed977efa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Aug 11 14:32:40 2011 +0200
None has not iteritems() method
>>> local_config.init("rhncfg")
Traceback (most recent call last):
File "<stdin>", line 1, in ?
File "/usr/share/rhn/config_common/local_config.py", line 101, in init
cp = rhncfgConfigParser._instance = rhncfgConfigParser(section, defaults)
File "/usr/share/rhn/config_common/local_config.py", line 29, in __init__
for (k, v) in defaults.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'
diff --git a/client/tools/rhncfg/config_common/local_config.py b/client/tools/rhncfg/config_common/local_config.py
index ebdacc9..5e9ed54 100644
--- a/client/tools/rhncfg/config_common/local_config.py
+++ b/client/tools/rhncfg/config_common/local_config.py
@@ -26,9 +26,10 @@ class rhncfgConfigParser(ConfigParser.ConfigParser):
def __init__(self, section, defaults=None):
"""defaults is either None, or a dictionary of default values which can be overridden"""
- for (k, v) in defaults.iteritems():
- if type(v) == int:
- defaults[k] = str(v)
+ if defaults:
+ for (k, v) in defaults.iteritems():
+ if type(v) == int:
+ defaults[k] = str(v)
ConfigParser.ConfigParser.__init__(self, defaults)
self.section = section
self.overrides = {}
12 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.6.20-1'
by Šimon Lukašík
Tag 'spacewalk-java-1.6.20-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-08-11 16:13 +0000
Tagging package [spacewalk-java] version [1.6.20-1] in directory [java/].
Changes since rhn-client-tools-1.6.12-1:
Simon Lukasik (2):
724918 - added missing acl checks
Automatic commit of package [spacewalk-java] release [1.6.20-1].
---
java/code/webapp/WEB-INF/struts-config.xml | 8 +++++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
---
12 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 04968b750b75975ac875366f0f1a99f730f2dee5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Aug 11 18:13:29 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.20-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3dbf539..8102912 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.19
+Version: 1.6.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Aug 11 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.20-1
+- 724918 - added missing acl checks (slukasik(a)redhat.com)
+
* Thu Aug 11 2011 Jan Pazdziora 1.6.19-1
- 728638 - Fixed kickstart.profile.setAdvancedOptions() to renderize the
kickstart after invocating method. (mmello(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0affcc2..b2930d9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.19-1 java/
+1.6.20-1 java/
12 years, 8 months
java/code
by Šimon Lukašík
java/code/webapp/WEB-INF/struts-config.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit af9a4989fea606567bfcee6b42eb34dd0edc258a
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Aug 11 18:10:49 2011 +0200
724918 - added missing acl checks
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index ed0de71..56c6d9b 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -7721,7 +7721,9 @@
scope="request"
name="datePickerForm"
input="/WEB-INF/pages/admin/taskStatus.jsp"
- type="com.redhat.rhn.frontend.action.satellite.TaskStatusAction">
+ type="com.redhat.rhn.frontend.action.satellite.TaskStatusAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="acls" value="user_role(satellite_admin)"/>
<forward name="default"
path="/WEB-INF/pages/admin/taskStatus.jsp" />
</action>
@@ -7732,6 +7734,7 @@
type="com.redhat.rhn.frontend.action.tasko.SatSchedulesAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls" value="user_role(satellite_admin)"/>
<forward name="default"
path="/WEB-INF/pages/admin/schedules.jsp" />
</action>
@@ -7743,6 +7746,7 @@
type="com.redhat.rhn.frontend.action.tasko.ScheduleDetailAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls" value="user_role(satellite_admin)"/>
<forward name="default"
path="/WEB-INF/pages/admin/scheduleDetail.jsp" />
<forward name="disable"
@@ -7758,6 +7762,7 @@
type="com.redhat.rhn.frontend.action.tasko.DeleteScheduleAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls" value="user_role(satellite_admin)"/>
<forward name="default"
path="/WEB-INF/pages/admin/deleteSchedule.jsp" />
<forward name="success"
@@ -7770,6 +7775,7 @@
type="com.redhat.rhn.frontend.action.tasko.BunchDetailAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls" value="user_role(satellite_admin)"/>
<forward name="default"
path="/WEB-INF/pages/admin/bunchDetail.jsp" />
</action>
12 years, 8 months
Changes to 'refs/tags/rhn-client-tools-1.6.12-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.6.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 14:30 +0000
Tagging package [rhn-client-tools] version [1.6.12-1] in directory [client/rhel/rhn-client-tools/].
Changes since tsdb-1.27.24-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.6.12-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 8 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5c2339a7f31c179367c05bf5521314499b4389dd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 11 16:30:14 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.12-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index deda3e9..7dd74b0 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.11
+Version: 1.6.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Aug 11 2011 Jan Pazdziora 1.6.12-1
+- 729161 - default to RHSM in firstboot registration (mzazrivec(a)redhat.com)
+- 729468 - firstboot dialogs polishing (mzazrivec(a)redhat.com)
+
* Thu Aug 11 2011 Miroslav Suchý 1.6.11-1
- do not mask original error by raise in execption
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index a05f31b..37001c1 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.11-1 client/rhel/rhn-client-tools/
+1.6.12-1 client/rhel/rhn-client-tools/
12 years, 8 months
Changes to 'refs/tags/tsdb-1.27.24-1'
by Jan Pazdziora
Tag 'tsdb-1.27.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-11 14:29 +0000
Tagging package [tsdb] version [1.27.24-1] in directory [monitoring/tsdb/].
Changes since SatConfig-general-1.216.24-1:
Jan Pazdziora (1):
Automatic commit of package [tsdb] release [1.27.24-1].
---
monitoring/tsdb/tsdb.spec | 7 ++++++-
rel-eng/packages/tsdb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 8 months
monitoring/tsdb rel-eng/packages
by Jan Pazdziora
monitoring/tsdb/tsdb.spec | 7 ++++++-
rel-eng/packages/tsdb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2b88a126af56f6fff7db44942f807992738b5e4a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 11 16:29:46 2011 +0200
Automatic commit of package [tsdb] release [1.27.24-1].
diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec
index f62f4aa..e0a5ce6 100644
--- a/monitoring/tsdb/tsdb.spec
+++ b/monitoring/tsdb/tsdb.spec
@@ -8,7 +8,7 @@
%define npbin %{_bindir}
Name: tsdb
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.27.23
+Version: 1.27.24
Release: 1%{?dist}
Summary: Time Series Database
URL: https://fedorahosted.org/spacewalk
@@ -90,6 +90,11 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Aug 11 2011 Jan Pazdziora 1.27.24-1
+- Properly dereference the array references for old and new files so logfiles
+ contain the number of files in the queue and not strings like
+ "ARRAY(0x12323)" (david.nutter(a)bioss.ac.uk)
+
* Fri Feb 18 2011 Jan Pazdziora 1.27.23-1
- Localize the filehandle globs; also use three-parameter opens.
diff --git a/rel-eng/packages/tsdb b/rel-eng/packages/tsdb
index 4352ddc..f2fb75c 100644
--- a/rel-eng/packages/tsdb
+++ b/rel-eng/packages/tsdb
@@ -1 +1 @@
-1.27.23-1 monitoring/tsdb/
+1.27.24-1 monitoring/tsdb/
12 years, 8 months