Changes to 'refs/tags/rhncfg-5.10.6-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-31 14:03 +0000
Tagging package [rhncfg] version [5.10.6-1] in directory [client/tools/rhncfg/].
Changes since rhn-client-tools-1.5.9-1:
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.10.6-1].
---
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 12 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b1eda3944c7a4d0522bff1e493de9154a2a0e105
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 31 16:03:03 2011 +0200
Automatic commit of package [rhncfg] release [5.10.6-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 20c3e9b..ec949fe 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.5
+Version: 5.10.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 31 2011 Jan Pazdziora 5.10.6-1
+- Fix python import (matteo.sessa(a)dbmsrl.com)
+
* Tue May 10 2011 Jan Pazdziora 5.10.5-1
- remove unused import, fix indentation and a minor typo (iartarisi(a)suse.cz)
- fix usage documentation messages for topdir and dest-file (iartarisi(a)suse.cz)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index f6cfede..d3ac0e1 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.5-1 client/tools/rhncfg/
+5.10.6-1 client/tools/rhncfg/
12 years, 12 months
Changes to 'refs/tags/rhn-client-tools-1.5.9-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.5.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-31 14:02 +0000
Tagging package [rhn-client-tools] version [1.5.9-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-web-1.5.14-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.5.9-1].
Matteo Sessa (1):
Fix python import
Miroslav Suchý (1):
fix typo
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 2 +-
client/tools/rhncfg/actions/configfiles.py | 1 +
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 12 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ba52bf9dc2f1390a04f4303cf30a75bf8b9f11e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 31 16:02:37 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.9-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2da946f..8c2d515 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.5.8
+Version: 1.5.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue May 31 2011 Jan Pazdziora 1.5.9-1
+- fix typo (msuchy(a)redhat.com)
+
* Mon May 23 2011 Miroslav Suchý 1.5.8-1
- 683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works
and is idempotent (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index a5889a3..86f7775 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.8-1 client/rhel/rhn-client-tools/
+1.5.9-1 client/rhel/rhn-client-tools/
12 years, 12 months
client/tools
by Jan Pazdziora
client/tools/rhncfg/actions/configfiles.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d1ed312c702500d09dca07b1dedfe2d2522c6320
Author: Matteo Sessa <matteo.sessa(a)dbmsrl.com>
Date: Tue May 31 13:20:22 2011 +0200
Fix python import
diff --git a/client/tools/rhncfg/actions/configfiles.py b/client/tools/rhncfg/actions/configfiles.py
index 5ec4ac4..76671ab 100755
--- a/client/tools/rhncfg/actions/configfiles.py
+++ b/client/tools/rhncfg/actions/configfiles.py
@@ -15,6 +15,7 @@
import os
import time
+import sys
from config_common import local_config, file_utils, utils, cfg_exceptions
from config_common.rhn_log import set_debug_level, get_debug_level, set_logfile, log_to_file
12 years, 12 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9cd999626558d033c0fec764391eb55f27a97b0b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 30 14:07:42 2011 +0200
fix typo
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 444e281..41091ad 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -871,7 +871,7 @@ class CreateProfilePage:
if conf_changed:
reviewLog.yum_plugin_conf_changed()
except IOError, e:
- errorWindow(_("Could not open /etc/yum/pluginconf.d/rhnplugin.conf\nyum-rhn-plugin is not enable.\n") + e.errmsg)
+ errorWindow(_("Could not open /etc/yum/pluginconf.d/rhnplugin.conf\nyum-rhn-plugin is not enabled.\n") + e.errmsg)
reviewLog.yum_plugin_conf_error()
rhnreg.spawnRhnCheckForUI()
pwin.setProgress(6,6)
12 years, 12 months
Changes to 'refs/tags/spacewalk-web-1.5.14-1'
by Michael Mraka
Tag 'spacewalk-web-1.5.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-30 10:07 +0000
Tagging package [spacewalk-web] version [1.5.14-1] in directory [web/].
Changes since spacewalk-java-1.5.41-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [1.5.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.5.41-1'
by Michael Mraka
Tag 'spacewalk-java-1.5.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-30 10:07 +0000
Tagging package [spacewalk-java] version [1.5.41-1] in directory [java/].
Changes since spacewalk-java-1.5.40-1:
Jan Blazek (2):
Add comps-spacewalk-server-fedora15.xml
Add comps-spacewalk-client-fedora15.xml
Julian Einwag (1):
made some queries PG compatible: - replaced (+) with ANSI left join - changed TO_DATE(NULL) to TO_DATE(NULL,NULL) - changed TO_NUMBER(NULL) to TO_NUMBER(NULL,NULL) - replaced DECODE with CASE
Michael Mraka (2):
fixing ISE in errata cloning
Automatic commit of package [spacewalk-java] release [1.5.41-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 10
java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml | 12
java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 49 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 11
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8
java/spacewalk-java.spec | 5
rel-eng/comps/comps-spacewalk-client-fedora15.xml | 36 ++
rel-eng/comps/comps-spacewalk-server-fedora15.xml | 163 ++++++++++
rel-eng/packages/spacewalk-java | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 22 -
web/modules/rhn/RHN/DB/ErrataEditor.pm | 2
11 files changed, 269 insertions(+), 51 deletions(-)
---
12 years, 12 months
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 62b94102836ea7d38ac780035092ed1e1ede0f78
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 30 12:07:37 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8b0b19a..3a85f2c 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.13-1 web/
+1.5.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 8c8a669..d100b48 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.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
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon May 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
+- made some queries PG compatible
+- fixing ISE in errata cloning
+
* Tue May 24 2011 Jan Pazdziora 1.5.13-1
- replaced (+) with ANSI left join (je(a)rockenstein.de)
commit 193e791fa0007ad92dbd730bc4af34406756f0db
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 30 12:07:16 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.41-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8b3c42a..7513c1d 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.5.40
+Version: 1.5.41
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
+* Mon May 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.41-1
+- made some queries PG compatible
+
* Fri May 27 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.40-1
- 443126 - introduce notifications for custom errata (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2fec23b..5c37d11 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.40-1 java/
+1.5.41-1 java/
12 years, 12 months
java/code web/modules
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 10 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml | 12 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 49 ++++++----
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 11 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8 -
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 22 ++--
6 files changed, 64 insertions(+), 48 deletions(-)
New commits:
commit 9103a4c0b5f7a715d37ddab1e7d7961d09edbb04
Author: Julian Einwag <je(a)rockenstein.de>
Date: Tue May 24 10:35:59 2011 +0200
made some queries PG compatible: - replaced (+) with ANSI left join - changed TO_DATE(NULL) to TO_DATE(NULL,NULL) - changed TO_NUMBER(NULL) to TO_NUMBER(NULL,NULL) - replaced DECODE with CASE
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index be03a6d..43ac7b6 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -13,8 +13,8 @@ SELECT EVENT_ID as ID,
DETAILS
FROM (SELECT SH.id EVENT_ID,
SH.summary SUMMARY,
- TO_DATE(NULL) AS created,
- TO_DATE(NULL) AS picked_up,
+ TO_DATE(NULL,NULL) AS created,
+ TO_DATE(NULL,NULL) AS picked_up,
SH.created as completed, -- view this as the "completed" date for sorting reasons
NULL AS history_status,
NULL AS history_type,
@@ -34,14 +34,14 @@ SELECT EVENT_ID as ID,
NULL AS details
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON A.scheduler = U.id,
rhnServerAction SA
WHERE SA.server_id = :sid
AND SA.action_id = A.id
AND ATYPE.id = A.action_type
AND AStat.id = SA.status
- AND U.id(+) = A.scheduler
AND AStat.id IN (1, 2, 3)
) X
ORDER BY COMPLETED DESC, PICKED_UP DESC, CREATED DESC, EVENT_ID DESC
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
index 3fd7d79..ec7d34c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
@@ -7,10 +7,10 @@ SELECT CDK.id,
CDK.description,
(
SELECT COUNT(SCDV.server_id)
- FROM rhnServerCustomDataValue SCDV,
- rhnUserServerPerms USP
+ FROM rhnUserServerPerms USP
+ LEFT JOIN rhnServerCustomDataValue SCDV
+ ON USP.server_id = SCDV.server_id
WHERE USP.user_id = :user_id
- AND USP.server_id = SCDV.server_id (+)
AND SCDV.key_id = CDK.id
) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
@@ -28,10 +28,10 @@ SELECT CDK.id,
CDK.description,
COUNT(SCDV.key_id) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
- FROM rhnServerCustomDataValue SCDV,
- rhnCustomDataKey CDK
+ FROM rhnCustomDataKey CDK
+ LEFT JOIN rhnServerCustomDataValue SCDV
+ ON CDK.id = SCDV.key_id
WHERE CDK.org_id = :org_id
- AND CDK.id = SCDV.key_id (+)
AND NOT EXISTS (
SELECT 1 FROM rhnServerCustomDataValue
WHERE server_id = :sid
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
index 8ccae6a..92fa36f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
@@ -124,21 +124,22 @@ WHERE customer_id = :org_id
<mode name="methods_in_org" class="com.redhat.rhn.frontend.dto.monitoring.MethodDto">
<query params="org_id">
<![CDATA[
-SELECT WC.id user_id,
- WC.login login,
- CM.recid recid,
- CM.method_name method_name,
- DECODE( MT.method_type_name,
- 'Email', CM.email_address,
- 'Pager', CM.pager_email,
- 'SNMP', CM.snmp_host) method_target,
+SELECT WC.id AS user_id,
+ WC.login AS login,
+ CM.recid AS recid,
+ CM.method_name AS method_name,
+ (CASE MT.method_type_name
+ WHEN 'Email' THEN CM.email_address
+ WHEN 'Pager' THEN CM.pager_email
+ WHEN 'SNMP' THEN CM.snmp_host
+ END) AS method_target,
MT.method_type_name method_type
- FROM rhn_contact_methods CM,
- web_contact WC,
- rhn_method_types MT
+ FROM rhn_contact_methods CM
+ LEFT JOIN rhn_method_types MT
+ ON CM.method_type_id = MT.recid,
+ web_contact WC
WHERE WC.org_id = :org_id
AND CM.contact_id = WC.id
- AND CM.method_type_id = MT.recid (+)
ORDER BY WC.login, CM.method_name
]]>
</query>
@@ -147,13 +148,23 @@ ORDER BY WC.login, CM.method_name
<mode name="servers_in_suite" class="com.redhat.rhn.frontend.dto.monitoring.MonitoredServerDto">
<query params="suite_id"><![CDATA[
SELECT distinct s.id, s.name,
-( SELECT DECODE(
- MAX(DECODE(statps.state, 'OK', 1, 'PENDING', 2, 'UNKNOWN', 3, 'WARNING', 4, 'CRITICAL', 5)),
- 1, 'OK', 2, 'PENDING', 3, 'UNKNOWN', 4, 'WARNING', 5, 'CRITICAL') ST
- FROM rhn_check_probe statcp, rhn_probe_state statps
- WHERE statcp.probe_id = statps.probe_id
- AND s.id = statcp.host_id(+)
- GROUP BY s.id ) status
+( SELECT (CASE
+ MAX(CASE statps.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5 END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL' END ) ST
+ FROM rhn_check_probe statcp
+ LEFT JOIN rhn_probe_state statps
+ ON s.id = statcp.host_id
+ WHERE statcp.probe_id = statps.probe_id
+ GROUP BY s.id ) status
FROM rhn_check_suites cs,
rhn_check_suite_probe csp,
rhn_service_probe_origins spo,
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
index 8964eec..bbe1f20 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
@@ -101,17 +101,18 @@ ORDER BY UPPER(NAME)
<mode name="visible_to_system">
<query params="sid, org_id, user_id">
- SELECT MAX(DECODE(VSGM.server_id, :sid, 1, 0)) is_system_member,
+ SELECT MAX(CASE VSGM.server_id WHEN :sid THEN 1 ELSE 0 END) is_system_member,
VSGM.GROUP_ID id,
VSGM.GROUP_NAME,
VSGM.GROUP_TYPE,
VSGM.CURRENT_MEMBERS,
VSGM.MAX_MEMBERS,
- DECODE(USGP.server_group_id,VSGM.group_id,1,0) AS USER_PERMITTED_ACCESS
- FROM rhnVisServerGroupMembership VSGM, rhnUserServerGroupPerms USGP
+ (CASE USGP.server_group_id WHEN VSGM.group_id THEN 1 ELSE 0 END) AS USER_PERMITTED_ACCESS
+ FROM rhnVisServerGroupMembership VSGM
+ LEFT JOIN rhnUserServerGroupPerms USGP
+ ON VSGM.group_id = USGP.server_group_id
+ AND :user_id = USGP.user_id
WHERE VSGM.ORG_ID = :org_id
- AND :user_id = USGP.user_id (+)
- AND VSGM.group_id = USGP.server_group_id (+)
GROUP BY VSGM.group_id, VSGM.group_name, VSGM.group_type, VSGM.current_members, VSGM.max_members, USGP.server_group_id
ORDER BY UPPER(VSGM.group_name), VSGM.group_id
</query>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3ab72a2..0b7bf98 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -501,15 +501,14 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
select a.server_id id,
s.name server_name,
COALESCE(sg.name,'Org Admin access') group_name
-from rhnServerGroup sg,
- rhnServer s,
+from rhnServer s,
(
select usg.user_id, sgm.server_id, sgm.server_group_id
from rhnServerGroupMembers sgm,
rhnUserServerGroupPerms usg
where usg.server_group_id = sgm.server_group_id
union all
- select ugm.user_id, s.id server_id, TO_NUMBER(null) server_group_id
+ select ugm.user_id, s.id server_id, TO_NUMBER(null,null) server_group_id
from rhnUserGroup ug,
rhnUserGroupMembers ugm,
rhnServer s,
@@ -522,9 +521,10 @@ from rhnServerGroup sg,
where label = 'org_admin')
and s.org_id = u.org_id
) a
+left join rhnServerGroup sg
+on a.server_group_id = sg.id
where a.user_id = :formvar_uid
and a.server_id in (%s)
- and a.server_group_id = sg.id(+)
and a.server_id = s.id
</elaborator>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index f9715da..5b8cfb0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -458,15 +458,14 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
select a.server_id id,
s.name server_name,
NVL(sg.name,'Org Admin access') group_name
-from rhnServerGroup sg,
- rhnServer s,
+from rhnServer s,
(
select usg.user_id, sgm.server_id, sgm.server_group_id
from rhnServerGroupMembers sgm,
rhnUserServerGroupPerms usg
where usg.server_group_id = sgm.server_group_id
union all
- select ugm.user_id, s.id server_id, TO_NUMBER(null) server_group_id
+ select ugm.user_id, s.id server_id, TO_NUMBER(null,null) server_group_id
from rhnUserGroup ug,
rhnUserGroupMembers ugm,
rhnServer s,
@@ -479,9 +478,10 @@ from rhnServerGroup sg,
where label = 'org_admin')
and s.org_id = u.org_id
) a
+left join rhnServerGroup sg
+on a.server_group_id = sg.id
where a.user_id = :some_user_id
and a.server_id in (%s)
- and a.server_group_id = sg.id(+)
and a.server_id = s.id
</elaborator>
<elaborator name="system_overview" />
@@ -1060,18 +1060,22 @@ SELECT DISTINCT ST.element AS ID
</mode>
<query name="available_to_user" params="user_id">
+select * from (
SELECT DISTINCT S.id,
S.name,
SI.server_id AS IS_RHN_SATELLITE,
PI.server_id AS IS_RHN_PROXY,
TO_CHAR(Sinfo.checkin, 'YYYY-MM-DD HH24:MI:SS') AS LAST_CHECKIN
- FROM rhnSatelliteInfo SI, rhnServerInfo SInfo, rhnProxyInfo PI, rhnServer S, rhnUserServerPerms USP
+ FROM rhnServer S
+ LEFT JOIN rhnSatelliteInfo SI
+ ON S.id = SI.server_id
+ LEFT JOIN rhnProxyInfo PI
+ ON S.id = PI.server_id,
+ rhnServerInfo SInfo, rhnUserServerPerms USP
WHERE USP.user_id = :user_id
AND S.id = USP.server_id
- AND S.id = SI.server_id (+)
- AND S.id = PI.server_id (+)
- AND Sinfo.server_id = S.id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ AND Sinfo.server_id = S.id ) X
+ORDER BY UPPER(NVL(X.name, '(none)')), X.id
</query>
12 years, 12 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/ErrataEditor.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bf937e3a5adc751e2b314382762b52b3ebe0fee5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 26 01:52:00 2011 +0200
fixing ISE in errata cloning
[Thu May 26 07:41:35 2011] [error] Execution of
/var/www/html/network/software/channels/manage/edit.pxt failed at Thu
May 26 07:41:35 2011: RHN::Exception: DBD::Pg::st execute failed: ERROR:
missing FROM-clause entry for table "rhn_erratafile_id_seq"\nLINE 4:
(SELECT rhn_erratafile_id_seq.nextval, $1, EF.type, E...\n
...
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 9a4804c..1effc03 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -239,7 +239,7 @@ EOQ
INSERT
INTO rhnErrataFileTmp
(id, errata_id, type, checksum_id, filename)
- (SELECT rhn_erratafile_id_seq.nextval, :new_eid, EF.type, EF.checksum_id, EF.filename
+ (SELECT sequence_nextval('rhn_erratafile_id_seq'), :new_eid, EF.type, EF.checksum_id, EF.filename
FROM rhnErrataFile EF
WHERE EF.errata_id = :old_eid)
EOQ
12 years, 12 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-client-fedora15.xml | 36 ++++++++++++++++++++++
1 file changed, 36 insertions(+)
New commits:
commit f6566289d81dd8172c59843b677deb4b5bd985b9
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Mon May 30 09:46:59 2011 +0200
Add comps-spacewalk-client-fedora15.xml
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora15.xml b/rel-eng/comps/comps-spacewalk-client-fedora15.xml
new file mode 100644
index 0000000..d8b5c4c
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-client-fedora15.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-client</id>
+ <name>Spacewalk Client</name>
+ <description>Spacewalk Client Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+ <packagereq type="default">rhncfg</packagereq>
+ <packagereq type="default">rhncfg-actions</packagereq>
+ <packagereq type="default">rhncfg-client</packagereq>
+ <packagereq type="default">rhncfg-management</packagereq>
+ <packagereq type="default">rhn-custom-info</packagereq>
+ <packagereq type="default">osad</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">rhn-virtualization-common</packagereq>
+ <packagereq type="default">rhn-virtualization-host</packagereq>
+ <packagereq type="default">spacewalk-koan</packagereq>
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhnmd</packagereq>
+ <packagereq type="default">rhnsd</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-client-repo</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ </packagelist>
+ </group>
+</comps>
12 years, 12 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-server-fedora15.xml | 163 ++++++++++++++++++++++
1 file changed, 163 insertions(+)
New commits:
commit 5b234a3c3a1d45a4d57831b771de3b561f3b90bd
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Mon May 30 07:47:28 2011 +0200
Add comps-spacewalk-server-fedora15.xml
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora15.xml b/rel-eng/comps/comps-spacewalk-server-fedora15.xml
new file mode 100644
index 0000000..fe0d2ea
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-server-fedora15.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-server</id>
+ <name>Spacewalk Server</name>
+ <description>Spacewalk Server Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+<!-- client libs - needed till it get propagated to distribuitions -->
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
+
+ <packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">heirloom-pkgtools</packagereq>
+ <packagereq type="default">jpam</packagereq>
+ <packagereq type="default">MessageQueue</packagereq>
+ <packagereq type="default">nocpulse-common</packagereq>
+ <packagereq type="default">nocpulse-db-perl</packagereq>
+ <packagereq type="default">NOCpulsePlugins</packagereq>
+ <packagereq type="default">NOCpulsePlugins-Oracle</packagereq>
+ <packagereq type="default">NPalert</packagereq>
+ <packagereq type="default">nutch</packagereq>
+ <packagereq type="default">oracle-instantclient-selinux</packagereq>
+ <packagereq type="default">oracle-instantclient-sqlplus-selinux</packagereq>
+ <packagereq type="default">oracle-lib-compat</packagereq>
+ <packagereq type="default">oracle-nofcontext-selinux</packagereq>
+ <packagereq type="default">oracle-selinux</packagereq>
+ <packagereq type="default">oracle-xe-selinux</packagereq>
+ <packagereq type="default">osa-dispatcher</packagereq>
+ <packagereq type="default">osa-dispatcher-selinux</packagereq>
+ <packagereq type="default">perl-DBD-Oracle</packagereq>
+ <packagereq type="default">perl-NOCpulse-CLAC</packagereq>
+ <packagereq type="default">perl-NOCpulse-Debug</packagereq>
+ <packagereq type="default">perl-NOCpulse-Gritch</packagereq>
+ <packagereq type="default">perl-NOCpulse-Object</packagereq>
+ <packagereq type="default">perl-NOCpulse-OracleDB</packagereq>
+ <packagereq type="default">perl-NOCpulse-PersistentConnection</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe-Oracle</packagereq>
+ <packagereq type="default">perl-NOCpulse-ProcessPool</packagereq>
+ <packagereq type="default">perl-NOCpulse-Scheduler</packagereq>
+ <packagereq type="default">perl-NOCpulse-SetID</packagereq>
+ <packagereq type="default">perl-NOCpulse-Utils</packagereq>
+ <packagereq type="default">perl-Satcon</packagereq>
+ <packagereq type="default">ProgAGoGo</packagereq>
+ <packagereq type="default">python-gzipstream</packagereq>
+ <packagereq type="default">quartz</packagereq>
+ <packagereq type="default">quartz-oracle</packagereq>
+ <packagereq type="default">redstone-xmlrpc</packagereq>
+ <packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">SatConfig-bootstrap</packagereq>
+ <packagereq type="default">SatConfig-bootstrap-server</packagereq>
+ <packagereq type="default">SatConfig-cluster</packagereq>
+ <packagereq type="default">SatConfig-general</packagereq>
+ <packagereq type="default">SatConfig-generator</packagereq>
+ <packagereq type="default">SatConfig-installer</packagereq>
+ <packagereq type="default">SatConfig-spread</packagereq>
+ <packagereq type="default">scdb</packagereq>
+ <packagereq type="default">simple-core</packagereq>
+ <packagereq type="default">SNMPAlerts</packagereq>
+ <packagereq type="default">spacecmd</packagereq>
+ <packagereq type="default">spacewalk-admin</packagereq>
+ <packagereq type="default">spacewalk-backend</packagereq>
+ <packagereq type="default">spacewalk-backend-app</packagereq>
+ <packagereq type="default">spacewalk-backend-applet</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-common</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-tool</packagereq>
+ <packagereq type="default">spacewalk-backend-iss</packagereq>
+ <packagereq type="default">spacewalk-backend-iss-export</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-package-push-server</packagereq>
+ <packagereq type="default">spacewalk-backend-server</packagereq>
+ <packagereq type="default">spacewalk-backend-sql</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-oracle</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-postgresql</packagereq>
+ <packagereq type="default">spacewalk-backend-tools</packagereq>
+ <packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
+ <packagereq type="default">spacewalk-backend-xp</packagereq>
+ <packagereq type="default">spacewalk-base</packagereq>
+ <packagereq type="default">spacewalk-base-minimal</packagereq>
+ <packagereq type="default">spacewalk-branding</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-client-repo</packagereq>
+ <packagereq type="default">spacewalk-common</packagereq>
+ <packagereq type="default">spacewalk-config</packagereq>
+ <packagereq type="default">spacewalk-dobby</packagereq>
+ <packagereq type="default">spacewalk-doc-indexes</packagereq>
+ <packagereq type="default">spacewalk-grail</packagereq>
+ <packagereq type="default">spacewalk-html</packagereq>
+ <packagereq type="default">spacewalk-java</packagereq>
+ <packagereq type="default">spacewalk-java-config</packagereq>
+ <packagereq type="default">spacewalk-java-lib</packagereq>
+ <packagereq type="default">spacewalk-java-oracle</packagereq>
+ <packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="default">spacewalk-monitoring</packagereq>
+ <packagereq type="default">spacewalk-monitoring-selinux</packagereq>
+ <packagereq type="default">spacewalk-oracle</packagereq>
+ <packagereq type="default">spacewalk-postgresql</packagereq>
+ <packagereq type="default">spacewalk-proxy-broker</packagereq>
+ <packagereq type="default">spacewalk-proxy-common</packagereq>
+ <packagereq type="default">spacewalk-proxy-docs</packagereq>
+ <packagereq type="default">spacewalk-proxy-html</packagereq>
+ <packagereq type="default">spacewalk-proxy-installer</packagereq>
+ <packagereq type="default">spacewalk-proxy-management</packagereq>
+ <packagereq type="default">spacewalk-proxy-monitoring</packagereq>
+ <packagereq type="default">spacewalk-proxy-package-manager</packagereq>
+ <packagereq type="default">spacewalk-proxy-redirect</packagereq>
+ <packagereq type="default">spacewalk-proxy-selinux</packagereq>
+ <packagereq type="default">spacewalk-pxt</packagereq>
+ <packagereq type="default">spacewalk-repo</packagereq>
+ <packagereq type="default">spacewalk-reports</packagereq>
+ <packagereq type="default">spacewalk-schema</packagereq>
+ <packagereq type="default">spacewalk-search</packagereq>
+ <packagereq type="default">spacewalk-selinux</packagereq>
+ <packagereq type="default">spacewalk-setup</packagereq>
+ <packagereq type="default">spacewalk-setup-jabberd</packagereq>
+ <packagereq type="default">spacewalk-slf4j</packagereq>
+ <packagereq type="default">spacewalk-sniglets</packagereq>
+ <packagereq type="default">spacewalk-ssl-cert-check</packagereq>
+ <packagereq type="default">spacewalk-taskomatic</packagereq>
+ <packagereq type="default">spacewalk-utils</packagereq>
+ <packagereq type="default">spacewalk-remote-utils</packagereq>
+ <packagereq type="default">SputLite-client</packagereq>
+ <packagereq type="default">SputLite-server</packagereq>
+ <packagereq type="default">ssl_bridge</packagereq>
+ <packagereq type="default">status_log_acceptor</packagereq>
+ <packagereq type="default">stringtree-json</packagereq>
+ <packagereq type="default">tanukiwrapper</packagereq>
+ <packagereq type="default">tsdb</packagereq>
+ </packagelist>
+ </group>
+ <group>
+ <id>spacewalk-server-docs</id>
+ <name>Spacewalk Server Documentation</name>
+ <description>Spacewalk Server Documentation Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">jpam-javadoc</packagereq>
+ </packagelist>
+ </group>
+ <group>
+ <id>spacewalk-server-no-install</id>
+ <name>Spacewalk Server Junk</name>
+ <description>Spacewalk Server Non-installatble Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">oracle-rhnsat-selinux</packagereq>
+ <packagereq type="optional">perl-DBD-Oracle-explain</packagereq>
+ </packagelist>
+ </group>
+</comps>
12 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.5.40-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.40-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-27 15:20 +0000
Tagging package [spacewalk-java] version [1.5.40-1] in directory [java/].
Changes since spacewalk-backend-1.5.30-1:
Jan Pazdziora (1):
No building on heirloom-pkgtools on Fedora 14 either.
Tomas Lestach (2):
443126 - introduce notifications for custom errata
Automatic commit of package [spacewalk-java] release [1.5.40-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 6 ++++
java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 8 +++++
java/code/src/com/redhat/rhn/domain/errata/Errata.java | 8 +++++
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 1
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 15 ++++++++++
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
rel-eng/tito.props | 2 -
9 files changed, 47 insertions(+), 3 deletions(-)
---
12 years, 12 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 75f897a07769b43bdda9a2fb11e32a613d8f16dd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 27 17:20:58 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.40-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 280f86c..8b3c42a 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.5.39
+Version: 1.5.40
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
+* Fri May 27 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.40-1
+- 443126 - introduce notifications for custom errata (tlestach(a)redhat.com)
+
* Fri May 27 2011 Jan Pazdziora 1.5.39-1
- 703858 - virt. channel subscription: mimic the behavior of original channel
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index db97e0b..2fec23b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.39-1 java/
+1.5.40-1 java/
12 years, 12 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 6 ++++
java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 8 +++++
java/code/src/com/redhat/rhn/domain/errata/Errata.java | 8 +++++
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 1
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 15 ++++++++++
6 files changed, 41 insertions(+)
New commits:
commit d9cff23cbc3f2ec1c7a91897b3cbfe9bc45426c9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 24 16:05:41 2011 +0200
443126 - introduce notifications for custom errata
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 308cacf..fc8b537 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -1166,6 +1166,12 @@ SELECT 1
</query>
</write-mode>
+<write-mode name="clear_errata_channel_notification">
+ <query params="eid, cid">
+ delete from rhnErrataQueue where errata_id = :eid and channel_id = :cid
+ </query>
+</write-mode>
+
<mode name="list_errata_notification">
<query params="eid">
SELECT errata_id, channel_id, next_action
diff --git a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
index c828584..51b0186 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
@@ -610,6 +610,14 @@ public abstract class AbstractErrata extends BaseDomainHelper implements
/**
* {@inheritDoc}
*/
+ public void addChannelNotification(Channel channelIn, Date dateIn) {
+ ErrataManager.clearErrataChannelNotifications(this, channelIn);
+ ErrataManager.addErrataNotification(this, channelIn, dateIn);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public List getNotificationQueue() {
return ErrataManager.listErrataNotifications(this);
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/Errata.java b/java/code/src/com/redhat/rhn/domain/errata/Errata.java
index 39ffd38..dd610c0 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/Errata.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/Errata.java
@@ -384,6 +384,14 @@ public interface Errata {
void addNotification(Date dateIn);
/**
+ * Add a new notification for this errata
+ * in specified channel
+ * @param channelIn affected channel
+ * @param dateIn The notify date
+ */
+ void addChannelNotification(Channel channelIn, Date dateIn);
+
+ /**
* List errata notifications that are queued
* @return list of maps with channel_id and time
*/
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index f055d18..942c59a 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -274,6 +274,7 @@ public class ErrataFactory extends HibernateFactory {
errata = publish(errata);
}
errata.addChannel(chan);
+ errata.addChannelNotification(chan, new Date());
Set<Package> packagesToPush = new HashSet<Package>();
DataResult<PackageOverview> packs;
diff --git a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
index 8bfbee5..c9fdaa2 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
@@ -28,6 +28,7 @@ import org.apache.log4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -59,6 +60,7 @@ public class CloneErrataAction
if (errata instanceof PublishedClonedErrata) {
errata.addChannel(currChan);
ErrataCacheManager.insertCacheForChannelErrata(cids, errata);
+ errata.addChannelNotification(currChan, new Date());
}
else {
Set<Channel> channelSet = new HashSet<Channel>();
@@ -72,6 +74,7 @@ public class CloneErrataAction
msg.getUser().getOrg());
published.setChannels(channelSet);
ErrataCacheManager.insertCacheForChannelErrata(cids, published);
+ published.addChannelNotification(currChan, new Date());
}
else {
log.debug("Re-publishing clone");
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index bff6a2a..57597b2 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -192,6 +192,7 @@ public class ErrataManager extends BaseManager {
Channel channel = ChannelManager.lookupByIdAndUser(channelId, user);
if (channel != null) {
errata.addChannel(channel);
+ errata.addChannelNotification(channel, new Date());
}
}
@@ -1303,6 +1304,20 @@ public class ErrataManager extends BaseManager {
}
/**
+ * Delete all errata notifications for an errata in specified channel
+ * @param e the errata to clear notifications for
+ * @param c affected channel
+ */
+ public static void clearErrataChannelNotifications(Errata e, Channel c) {
+ Map params = new HashMap();
+ params.put("eid", e.getId());
+ params.put("cid", c.getId());
+ WriteMode m = ModeFactory.getWriteMode(
+ "Errata_queries", "clear_errata_channel_notification");
+ m.executeUpdate(params);
+ }
+
+ /**
* List queued errata notifications
* @param e the errata
* @return list of maps
12 years, 12 months
rel-eng/tito.props
by Jan Pazdziora
rel-eng/tito.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ef7d9ad64149489499fda79006abc840ca80a002
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:47:13 2011 +0200
No building on heirloom-pkgtools on Fedora 14 either.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 004ef50..d23f476 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -17,7 +17,7 @@ blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-p
[dist-f14-sw-1.5-candidate]
disttag = .fc14
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
[dist-f15-sw-1.5-candidate]
disttag = .fc15
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.30-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.30-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-27 14:37 +0000
Tagging package [spacewalk-backend] version [1.5.30-1] in directory [backend/].
Changes since spacewalk-koan-0.2.19-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.5.30-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
2 commits - backend/spacewalk-backend.spec client/tools rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
client/tools/spacewalk-koan/spacewalk-koan.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-koan | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 20f41c3a6c8b0f83ff29a50b14388c158997a28b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:37:50 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.30-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 16fd4e4..27636c7 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.29
+Version: 1.5.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 27 2011 Jan Pazdziora 1.5.30-1
+- download packages in 4 simultanous threads (msuchy(a)redhat.com)
+
* Wed May 25 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
- timestamps expects YYYYMMDDHHMISS
- fixed table aliases
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 39bbbe7..29b8852 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.29-1 backend/
+1.5.30-1 backend/
commit 5b614f0f50d68b57a1e1d07f6ef91e9604cffa63
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:34:00 2011 +0200
Automatic commit of package [spacewalk-koan] release [0.2.19-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 51104d7..21a2402 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.2.18
+Version: 0.2.19
Release: 1%{?dist}
BuildArch : noarch
URL: https://fedorahosted.org/spacewalk
@@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Fri May 27 2011 Jan Pazdziora 0.2.19-1
+- 687850 - guest provisioning: correct block device detection
+ (mzazrivec(a)redhat.com)
+
* Fri Apr 15 2011 Jan Pazdziora 0.2.18-1
- build spacewalk-koan on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index d2f68b6..5f4db50 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-0.2.18-1 client/tools/spacewalk-koan/
+0.2.19-1 client/tools/spacewalk-koan/
13 years
Changes to 'refs/tags/spacewalk-koan-0.2.19-1'
by Jan Pazdziora
Tag 'spacewalk-koan-0.2.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-27 14:34 +0000
Tagging package [spacewalk-koan] version [0.2.19-1] in directory [client/tools/spacewalk-koan/].
Changes since spacewalk-java-1.5.39-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-koan] release [0.2.19-1].
---
client/tools/spacewalk-koan/spacewalk-koan.spec | 6 +++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
Changes to 'refs/tags/spacewalk-java-1.5.39-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.39-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-27 14:33 +0000
Tagging package [spacewalk-java] version [1.5.39-1] in directory [java/].
Changes since spacewalk-setup-1.5.7-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.39-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d2ba42b8c566d6f1c7ab6d2373801dd75101799f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:33:37 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.39-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ea45c8c..280f86c 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.5.38
+Version: 1.5.39
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 27 2011 Jan Pazdziora 1.5.39-1
+- 703858 - virt. channel subscription: mimic the behavior of original channel
+ (mzazrivec(a)redhat.com)
+
* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.38-1
- 708083 - clone Red Hat errata, when associating them into a cloned channel
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index efbde22..db97e0b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.38-1 java/
+1.5.39-1 java/
13 years
Changes to 'refs/tags/spacewalk-setup-1.5.7-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-27 14:33 +0000
Tagging package [spacewalk-setup] version [1.5.7-1] in directory [spacewalk/setup/].
Changes since spacewalk-java-1.5.38-1:
Jan Pazdziora (3):
708357 - If the mountpoint is on NFS, set cobbler_use_nfs.
Start building on Fedora 15.
Automatic commit of package [spacewalk-setup] release [1.5.7-1].
Milan Zazrivec (2):
687850 - guest provisioning: correct block device detection
703858 - virt. channel subscription: mimic the behavior of original channel
Miroslav Suchý (1):
download packages in 4 simultanous threads
---
backend/satellite_tools/satsync.py | 227 ++++++----
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 15
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 7
rel-eng/build-missing-builds-in-koji.sh | 2
rel-eng/koji-missing-builds.py | 3
rel-eng/packages/spacewalk-setup | 2
rel-eng/tito.props | 6
spacewalk/setup/bin/spacewalk-make-mount-points | 1
spacewalk/setup/spacewalk-setup.spec | 5
9 files changed, 183 insertions(+), 85 deletions(-)
---
13 years
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8ee04e1022c7acc7ddb12d3a4ebeb135916a8519
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:33:16 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.7-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 71c1ea4..8026f6f 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.6-1 spacewalk/setup/
+1.5.7-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 3138c8b..4ae4756 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Fri May 27 2011 Jan Pazdziora 1.5.7-1
+- 708357 - If the mountpoint is on NFS, set cobbler_use_nfs.
+
* Mon May 16 2011 Jan Pazdziora 1.5.6-1
- We only want to source the setenv.sh if it exists.
13 years
rel-eng/build-missing-builds-in-koji.sh rel-eng/koji-missing-builds.py rel-eng/tito.props
by Jan Pazdziora
rel-eng/build-missing-builds-in-koji.sh | 2 +-
rel-eng/koji-missing-builds.py | 3 ++-
rel-eng/tito.props | 6 +++++-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit d675547c226c30aab3856c28ee2d6242d255e1fd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu May 26 14:14:10 2011 +0200
Start building on Fedora 15.
diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh
index bf4dd23..ae8b8d4 100755
--- a/rel-eng/build-missing-builds-in-koji.sh
+++ b/rel-eng/build-missing-builds-in-koji.sh
@@ -6,7 +6,7 @@ if [ "$(basename $0)" == "build-missing-builds-in-brew.sh" ] ; then
KOJI_MISSING_BUILD_BREW_ARG="--brew"
TITO_BUILD_ARG="--cvs-release"
else
- TAGS="dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1.5-candidate"
+ TAGS="dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1.5-candidate dist-f15-sw-1.5-candidate"
TITO_BUILD_ARG="--koji-release"
FEDORA_UPLOAD=1
fi
diff --git a/rel-eng/koji-missing-builds.py b/rel-eng/koji-missing-builds.py
index b9feb93..f052ab7 100755
--- a/rel-eng/koji-missing-builds.py
+++ b/rel-eng/koji-missing-builds.py
@@ -39,7 +39,8 @@ distmap = {'6E':'.el6',
'f11':'.fc11',
'f12':'.fc12',
'f13':'.fc13',
- 'f14': ['.fc13','.fc14']}
+ 'f14':'.fc14',
+ 'f15':'.fc15'}
distsuffix = ''
tag = args[0]
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index 4879b25..004ef50 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -5,7 +5,7 @@ changelog_with_email = 0
changelog_do_not_remove_cherrypick = 0
[koji]
-autobuild_tags = dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1.5-candidate
+autobuild_tags = dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1.5-candidate dist-f15-sw-1.5-candidate
[dist-5E-sw-1.5-candidate]
disttag = .el5
@@ -18,3 +18,7 @@ blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-p
[dist-f14-sw-1.5-candidate]
disttag = .fc14
blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
+
+[dist-f15-sw-1.5-candidate]
+disttag = .fc15
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata heirloom-pkgtools
13 years
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/bin/spacewalk-make-mount-points | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 00242dd1722b463915f9dd3ce4c8962fe82844f6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 27 16:17:18 2011 +0200
708357 - If the mountpoint is on NFS, set cobbler_use_nfs.
diff --git a/spacewalk/setup/bin/spacewalk-make-mount-points b/spacewalk/setup/bin/spacewalk-make-mount-points
index 01c206f..63401bf 100755
--- a/spacewalk/setup/bin/spacewalk-make-mount-points
+++ b/spacewalk/setup/bin/spacewalk-make-mount-points
@@ -51,6 +51,7 @@ for my $dir (sort { length $a <=> length $b } keys %dirs) {
}
if ($seen_nfs and Spacewalk::Setup::have_selinux()) {
system('/usr/sbin/setsebool', '-P', 'spacewalk_nfs_mountpoint', 1);
+ system('/usr/sbin/setsebool', '-P', 'cobbler_use_nfs', 1);
}
exit 0;
13 years
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 990de0ead0f2208c551421477b8023a11c7e67ef
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 27 14:17:31 2011 +0200
703858 - virt. channel subscription: mimic the behavior of original channel
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index b80653b..1753dac 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -32,6 +32,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.common.validator.ValidatorResult;
import com.redhat.rhn.common.validator.ValidatorWarning;
import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.channel.ClonedChannel;
import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.entitlement.Entitlement;
import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement;
@@ -1570,6 +1571,12 @@ public class SystemManager extends BaseManager {
if (!ConfigDefaults.get().isSpacewalk()) {
// just install libvirt for RHEL6 base channel
Channel base = server.getBaseChannel();
+
+ if (base.isCloned()) {
+ ClonedChannel clonedBase = (ClonedChannel) base;
+ base = clonedBase.getOriginal();
+ }
+
if ((base != null) &&
base.isRhelChannel() &&
base.isReleaseXChannel(6)) {
13 years
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/satsync.py | 227 ++++++++++++++++++++++++-------------
1 file changed, 149 insertions(+), 78 deletions(-)
New commits:
commit 2340364e1063b5c38f5d47575c19e53fd4efc516
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 27 08:43:35 2011 +0200
download packages in 4 simultanous threads
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 7786098..f58c77e 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -26,6 +26,9 @@ import string
import time
import types
import exceptions
+import Queue
+import threading
+import itertools
from optparse import Option, OptionParser
from rhn.connections import idn_ascii_to_pune, idn_pune_to_unicode
@@ -406,8 +409,8 @@ class Syncer:
self._missing_channel_packages = None
self._missing_fs_packages = None
- self._failed_fs_packages = {}
- self._extinct_packages = {}
+ self._failed_fs_packages = Queue.Queue()
+ self._extinct_packages = Queue.Queue()
self._channel_errata = {}
self._missing_channel_errata = {}
@@ -1712,7 +1715,6 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# XXX misa: deal with source rpms
errata_file['pkgobj'] = None
-
def _fetch_packages(self, channel, missing_fs_packages, sources=0):
short_package_collection = sync_handlers.ShortPackageCollection()
if sources:
@@ -1722,91 +1724,52 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# acronym = "RPM"
package_collection = sync_handlers.PackageCollection()
- self._failed_fs_packages.clear()
- self._extinct_packages.clear()
+ self._failed_fs_packages = Queue.Queue()
+ self._extinct_packages = Queue.Queue()
pkgs_total = len(missing_fs_packages)
pkg_current = 0
- cfg = config.initUp2dateConfig()
total_size = 0
+ queue = Queue.Queue()
+ out_queue = Queue.Queue()
+ lock = threading.Lock()
+
#count size of missing packages
for package_id, path in missing_fs_packages:
timestamp = short_package_collection.get_package_timestamp(package_id)
package = package_collection.get_package(package_id, timestamp)
total_size = total_size+package['package_size']
+ queue.put((package_id, path))
log(1, messages.package_fetch_total_size %
(self._bytes_to_fuzzy(total_size)))
-
real_processed_size = processed_size = 0
real_total_size = total_size
start_time = round(time.time())
- for package_id, path in missing_fs_packages:
- pkg_current = pkg_current + 1
- timestamp = short_package_collection.get_package_timestamp(package_id)
- package = package_collection.get_package(package_id, timestamp)
- checksum_type = package['checksum_type']
- checksum = package['checksum']
- package_size = package['package_size']
- if not path:
- nevra = get_nevra(package)
- orgid = None
- if package['org_id']:
- orgid = OPTIONS.orgid or DEFAULT_ORG
- path = self._get_rel_package_path(nevra, orgid, sources,
- checksum_type, checksum)
+ all_threads=[]
+ for i in range(4):
+ t = ThreadDownload(lock, queue, out_queue, short_package_collection, package_collection, self, self._failed_fs_packages, self._extinct_packages, sources, channel)
+ t.setDaemon(True)
+ t.start()
+ all_threads.append(t)
- # update package path
- package['path'] = path
- package_collection.add_item(package)
+ while list(itertools.ifilter(lambda x: x.isAlive(), all_threads)) or out_queue.qsize() > 0:
+ try:
+ (rpmManip, package, is_done) = out_queue.get_nowait()
+ except Queue.Empty:
+ time.sleep(0.1)
+ continue
+ pkg_current = pkg_current + 1
- errcode = self._verify_file(path, rhnLib.timestamp(timestamp), package_size,
- checksum_type, checksum)
- if errcode == 0:
- # file is already there
- # do not count this size to time estimate
+ if not is_done: # package failed to download or already exist on disk
real_total_size -= package['package_size']
processed_size += package['package_size']
- continue
-
- rpmManip = RpmManip(package, path)
- nvrea = rpmManip.nvrea()
-
- # Retry a number of times, we may have network errors
- for i in range(cfg['networkRetries']):
- rpmFile, stream = self._get_package_stream(channel,
- package_id, nvrea, sources)
- if stream is None:
- # Mark the package as extinct
- self._extinct_packages[package_id] = path
- log(1, messages.package_fetch_extinct %
- (pkg_current, pkgs_total, os.path.basename(path)))
- break # inner for
-
try:
- rpmManip.write_file(stream)
- break # inner for
- except FileCreationError, e:
- msg = e[0]
- log2disk(-1, _("Unable to save file %s: %s") % (
- rpmManip.full_path, msg))
- # Try again
- continue
-
- else: #for
- # Ran out of iterations
- # Mark the package as failed and move on
- self._failed_fs_packages[package_id] = path
- log(1, messages.package_fetch_failed %
- (pkg_current, pkgs_total, os.path.basename(path)))
- # Move to the next package
- continue
-
- if stream is None:
- # Package is extinct. Move on
+ out_queue.task_done()
+ except AttributeError:
+ pass
continue
-
# Package successfully saved
filename = os.path.basename(rpmManip.relative_path)
@@ -1823,19 +1786,13 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
log(1, messages.package_fetch_successful %
(pkg_current, pkgs_total, filename, size))
+ try:
+ out_queue.task_done()
+ except AttributeError:
+ pass
- if self.mountpoint:
- # Channel dumps import; try to unlink to preserve disk space
- # rpmFile is always returned by _get_package_stream for
- # disk-based imports
- assert(rpmFile is not None)
- try:
- os.unlink(rpmFile)
- except:
- pass
-
- extinct_count = len(self._extinct_packages.keys())
- failed_count = len(self._failed_fs_packages.keys())
+ extinct_count = self._extinct_packages.qsize()
+ failed_count = self._failed_fs_packages.qsize()
# Printing summary
log(2, messages.package_fetch_summary % channel, notimeYN=1)
@@ -1889,6 +1846,120 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
return (None, stream)
+class ThreadDownload(threading.Thread):
+ def __init__(self, lock, queue, out_queue, short_package_collection, package_collection, syncer, failed_fs_packages, extinct_packages, sources, channel):
+ threading.Thread.__init__(self)
+ self.queue = queue
+ self.out_queue = out_queue
+ self.short_package_collection = short_package_collection
+ self.package_collection = package_collection
+ self.syncer = syncer
+ self.failed_fs_packages = failed_fs_packages
+ self.extinct_packages = extinct_packages
+ self.sources = sources
+ self.channel = channel
+ self.lock = lock
+
+ def run(self):
+ while not self.queue.empty():
+ #grabs host from queue
+ (package_id, path) = self.queue.get()
+ timestamp = self.short_package_collection.get_package_timestamp(package_id)
+ package = self.package_collection.get_package(package_id, timestamp)
+ checksum_type = package['checksum_type']
+ checksum = package['checksum']
+ package_size = package['package_size']
+ if not path:
+ nevra = get_nevra(package)
+ orgid = None
+ if package['org_id']:
+ orgid = OPTIONS.orgid or DEFAULT_ORG
+ path = self.syncer._get_rel_package_path(nevra, orgid, self.sources,
+ checksum_type, checksum)
+
+ # update package path
+ package['path'] = path
+ self.package_collection.add_item(package)
+
+ errcode = self.syncer._verify_file(path, rhnLib.timestamp(timestamp), package_size,
+ checksum_type, checksum)
+ if errcode == 0:
+ # file is already there
+ # do not count this size to time estimate
+ try:
+ self.queue.task_done()
+ except AttributeError:
+ pass
+ self.out_queue.put((None, package, False))
+ continue
+
+ cfg = config.initUp2dateConfig()
+ rpmManip = RpmManip(package, path)
+ nvrea = rpmManip.nvrea()
+
+ # Retry a number of times, we may have network errors
+ for i in range(cfg['networkRetries']):
+ self.lock.acquire()
+ rpmFile, stream = self.syncer._get_package_stream(self.channel,
+ package_id, nvrea, self.sources)
+ self.lock.release()
+ if stream is None:
+ # Mark the package as extinct
+ self.extinct_packages.put(package_id)
+ log(1, messages.package_fetch_extinct %
+ (pkg_current, pkgs_total, os.path.basename(path)))
+ break # inner for
+
+ try:
+ rpmManip.write_file(stream)
+ break # inner for
+ except FileCreationError, e:
+ msg = e[0]
+ log2disk(-1, _("Unable to save file %s: %s") % (
+ rpmManip.full_path, msg))
+ # Try again
+ continue # inner for
+
+ else: #for
+ # Ran out of iterations
+ # Mark the package as failed and move on
+ self.failed_fs_packages.put(package_id)
+ log(1, messages.package_fetch_failed %
+ (pkg_current, pkgs_total, os.path.basename(path)))
+ # Move to the next package
+ try:
+ self.queue.task_done()
+ except AttributeError:
+ pass
+ self.out_queue.put((rpmManip, package, False))
+ continue
+
+ if stream is None:
+ # Package is extinct. Move on
+ try:
+ self.queue.task_done()
+ except AttributeError:
+ pass
+ self.out_queue.put((rpmManip, package, False))
+ continue
+
+ if self.syncer.mountpoint:
+ # Channel dumps import; try to unlink to preserve disk space
+ # rpmFile is always returned by _get_package_stream for
+ # disk-based imports
+ assert(rpmFile is not None)
+ try:
+ os.unlink(rpmFile)
+ except:
+ pass
+
+ #signals to queue job is done
+ try:
+ self.queue.task_done()
+ except AttributeError:
+ pass
+ self.out_queue.put((rpmManip, package, True))
+
class StreamProducer:
def __init__(self, handler, data_source_class, source_func):
13 years
client/tools
by Milan Zazrivec
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 15 +++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 1552baf8e506bfb561835f159899b110213d18bf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 27 10:46:05 2011 +0200
687850 - guest provisioning: correct block device detection
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index 3c9db8a..0b25e53 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -161,14 +161,25 @@ class VirtDiskPathExistsError(Exception):
return "Virt Disk Path %s already exists on the host system. Please provide another disk path for the virt guest and reschedule your guest kickstart." % self.value
+class BlockDeviceNonexistentError(Exception):
+ def __init__(self, device_path):
+ self.value = device_path
+ def __str__(self):
+ return "Block Device Path %s does not exist on the host system. Please create the device for the virtual guest and reschedule your guest kickstart." % self.value
+
+
def initiate_guest(kickstart_host, cobbler_system_name, virt_type, name, mem_kb,
vcpus, disk_gb, virt_bridge, disk_path, extra_append, log_notify_handler=None):
error_messages = {}
success = 0
try:
- if os.path.exists(disk_path):
- raise VirtDiskPathExistsError(disk_path)
+ if disk_path.startswith('/dev/'):
+ if not os.path.exists(disk_path):
+ raise BlockDeviceNonexistentError(disk_path)
+ else:
+ if os.path.exists(disk_path):
+ raise VirtDiskPathExistsError(disk_path)
k = Koan()
k.list_items = 0
k.server = kickstart_host
13 years
Changes to 'refs/tags/spacewalk-java-1.5.38-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.38-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-26 17:40 +0000
Tagging package [spacewalk-java] version [1.5.38-1] in directory [java/].
Changes since spacewalk-java-1.5.37-1:
Tomas Lestach (3):
create special symlink for f15 tomcat-juli.jar
708083 - clone Red Hat errata, when associating them into a cloned channel
Automatic commit of package [spacewalk-java] release [1.5.38-1].
---
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 14 +++++++
java/spacewalk-java.spec | 18 +++++++---
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 28 insertions(+), 6 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2914553dae4b00a5b5deed3fde057a213d19feb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 19:40:57 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.38-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d1798c5..ea45c8c 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.5.37
+Version: 1.5.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.38-1
+- 708083 - clone Red Hat errata, when associating them into a cloned channel
+ (tlestach(a)redhat.com)
+- create special symlink for f15 tomcat-juli.jar (tlestach(a)redhat.com)
+
* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.37-1
- adding jaf build require for spacewalk-java (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9931eff..efbde22 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.37-1 java/
+1.5.38-1 java/
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 14 +++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 41c17c45df6d61be16847cdebd5a337714bb5a48
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 19:26:59 2011 +0200
708083 - clone Red Hat errata, when associating them into a cloned channel
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index 357c5a7..679e89c 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -14,12 +14,16 @@
*/
package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.user.UserManager;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -120,7 +124,8 @@ public class NewChannelHelper {
}
else {
cloned.getPackages().addAll(toClone.getPackages());
- cloned.getErratas().addAll(toClone.getErratas());
+ ErrataManager.publishErrataToChannelAsync(cloned,
+ getErrataIds(toClone.getErratas()), user);
}
//adopt the channel into the org's channelfamily
@@ -133,6 +138,13 @@ public class NewChannelHelper {
return cloned;
}
+ private Set<Long> getErrataIds(Set<Errata> errata) {
+ Set<Long> ids = new HashSet();
+ for (Errata erratum : errata) {
+ ids.add(erratum.getId());
+ }
+ return ids;
+ }
/**
* Verifies a potential name for a channel
13 years
java/spacewalk-java.spec
by Tomas Lestach
java/spacewalk-java.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1677d09cf8d5c8226f6884136a0dc36105cff75c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 18:56:40 2011 +0200
create special symlink for f15 tomcat-juli.jar
adressing spacewalk-java buildlog:
taskdef A class needed by class com.redhat.rhn.internal.jasper2.JspfC cannot be found: org/apache/juli/logging/LogFactory
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b727fd4..d1798c5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -272,10 +272,15 @@ This package contains the Java version of taskomatic.
%setup -q
# missing tomcat juli JAR (needed for JSP precompilation) - bug 661244
-if test -d /usr/share/tomcat6 -a ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+if test -d /usr/share/tomcat6; then
mkdir -p build/build-lib
- ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
- build/build-lib/tomcat-juli.jar
+ if test ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+ ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ else
+ ln -s /usr/share/java/tomcat6/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ fi
fi
13 years
Changes to 'refs/tags/spacewalk-java-1.5.37-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.37-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-26 16:08 +0000
Tagging package [spacewalk-java] version [1.5.37-1] in directory [java/].
Changes since spacewalk-java-1.5.36-1:
Tomas Lestach (2):
adding jaf build require for spacewalk-java
Automatic commit of package [spacewalk-java] release [1.5.37-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4319d5400d14f192fe6d54ce201842ec6c0c875a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 18:08:06 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3bb2498..b727fd4 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.5.36
+Version: 1.5.37
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -541,6 +541,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.37-1
+- adding jaf build require for spacewalk-java (tlestach(a)redhat.com)
+
* Wed May 25 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.36-1
- 707658 - generate errata cache for the correct erratum (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d8e0c74..9931eff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.36-1 java/
+1.5.37-1 java/
13 years
java/spacewalk-java.spec
by Tomas Lestach
java/spacewalk-java.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d0ab2d40a8b9166d8f713358d2f77e403e266cd1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 17:47:20 2011 +0200
adding jaf build require for spacewalk-java
addressing error in f15 build log:
[exec] /usr/bin/build-jar-repository: error: Could not find jaf Java extension for this JVM
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8508889..3bb2498 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -114,6 +114,7 @@ BuildRequires: concurrent
BuildRequires: cglib
BuildRequires: dom4j
BuildRequires: hibernate3
+BuildRequires: jaf
BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
13 years
Changes to 'refs/tags/spacewalk-java-1.5.36-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.36-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-25 16:33 +0000
Tagging package [spacewalk-java] version [1.5.36-1] in directory [java/].
Changes since spacewalk-backend-1.5.29-1:
Tomas Lestach (2):
707658 - generate errata cache for the correct erratum
Automatic commit of package [spacewalk-java] release [1.5.36-1].
---
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
13 years
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 74a9859ad4a75f8abc4214fdd6a7a77739c23982
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 25 18:33:00 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.36-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d3e1159..8508889 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.5.35
+Version: 1.5.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 25 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.36-1
+- 707658 - generate errata cache for the correct erratum (tlestach(a)redhat.com)
+
* Tue May 24 2011 Jan Pazdziora 1.5.35-1
- 703273 - check, whether subscription is possible (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4d8632c..d8e0c74 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.35-1 java/
+1.5.36-1 java/
commit 6e2282aa431e12e66e6d202956695550822568e8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 25 18:25:09 2011 +0200
707658 - generate errata cache for the correct erratum
diff --git a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
index 295cf4f..8bfbee5 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
@@ -58,6 +58,7 @@ public class CloneErrataAction
Errata errata = ErrataFactory.lookupById(eid);
if (errata instanceof PublishedClonedErrata) {
errata.addChannel(currChan);
+ ErrataCacheManager.insertCacheForChannelErrata(cids, errata);
}
else {
Set<Channel> channelSet = new HashSet<Channel>();
@@ -70,6 +71,7 @@ public class CloneErrataAction
Errata published = PublishErrataHelper.cloneErrataFast(errata,
msg.getUser().getOrg());
published.setChannels(channelSet);
+ ErrataCacheManager.insertCacheForChannelErrata(cids, published);
}
else {
log.debug("Re-publishing clone");
@@ -78,7 +80,6 @@ public class CloneErrataAction
}
- ErrataCacheManager.insertCacheForChannelErrata(cids, errata);
}
}
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.29-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-25 13:57 +0000
Tagging package [spacewalk-backend] version [1.5.29-1] in directory [backend/].
Changes since spacewalk-web-1.5.13-1:
Michael Mraka (5):
channel timestamp expects YYYYMMDDHHMISS
fixed table aliases
errata timestamp expects YYYYMMDDHHMISS
package timestamp expects YYYYMMDDHHMISS
Automatic commit of package [spacewalk-backend] release [1.5.29-1].
Miroslav Suchý (1):
block python-hwdata
---
backend/server/repomd/mapper.py | 12 ++++++------
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/tito.props | 6 +++---
4 files changed, 15 insertions(+), 11 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3f9635b8cc71effdaf3b5caf89ac79b91065180e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 25 15:57:10 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.29-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6ec0c84..16fd4e4 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.28
+Version: 1.5.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 25 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
+- timestamps expects YYYYMMDDHHMISS
+- fixed table aliases
+
* Tue May 24 2011 Jan Pazdziora 1.5.28-1
- We need to specifically check for None when calling decode.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b8df06b..39bbbe7 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.28-1 backend/
+1.5.29-1 backend/
13 years
4 commits - backend/server
by Michael Mraka
backend/server/repomd/mapper.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bd4c10f6b40c5efbc1a13b09154cd8585d4e3d41
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
package timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File "/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line 333, in get_repomd_file
...
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnCache.py", line 259, in has_key
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line 84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '201105241737360400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index ed5c7ce..7fd79e6 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -334,7 +334,7 @@ class SqlPackageMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnPackage
where id = :package_id
commit 15d3b2a318457b6f357f6e847bff46f4b6abea8f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
errata timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File "/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line 348, in get_repomd_file
...
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line 84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '20110523182837.3651460400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index 7d68007..ed5c7ce 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -547,7 +547,7 @@ class SqlErratumMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnErrata
where id = :erratum_id
commit b01640638157ba057e1d5e57fe1e4606e73561e9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:47:18 2011 +0200
fixed table aliases
fixing
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 269, in _execute_wrapper
raise rhnSQL.SQLStatementPrepareError(0, str(e), self.sql)
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('missing FROM-clause entry for table "pr"\nLINE 28: pr.sense,\n ^\n', 0, "\n select\n 'provides',\n pp.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageProvides pp\n where\n pp.package_id = %(package_id)s\n and pp.capability_id = pc.id\n union all\n select\n 'requires',\n pr.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageRequires pr\n where\n pr.package_id = %(package_id)s\n and pr.capability_id = pc.id\n union all\n select\n 'recommends',\n pr.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageRecommends prec\n where\n prec.package_id = %(package_id)s\n and prec.capability_id = pc.id\n union all\n select\n 'supplements',\n pr.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageSupplements supp\n where\n supp.package_id = %(package_id)s\n and supp.capability_id = pc.id\n union all\n select\n 'suggests',\n pr.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageSuggests sugg\n where\n sugg.package_id = %(package_id)s\n and sugg.capability_id = pc.id\n union all\n select\n 'conflicts',\n pcon.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageConflicts pcon\n where\n pcon.package_id = %(package_id)s\n and pcon.capability_id = pc.id\n union all\n select\n 'obsoletes',\n po.sense,\n pc.name,\n pc.version\n from\n rhnPackageCapability pc,\n rhnPackageObsoletes po\n where\n po.package_id = %(package_id)s\n and po.capability_id = pc.id\n ")
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index abf322d..7d68007 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -273,7 +273,7 @@ class SqlPackageMapper:
union all
select
'recommends',
- pr.sense,
+ prec.sense,
pc.name,
pc.version
from
@@ -285,7 +285,7 @@ class SqlPackageMapper:
union all
select
'supplements',
- pr.sense,
+ supp.sense,
pc.name,
pc.version
from
@@ -297,7 +297,7 @@ class SqlPackageMapper:
union all
select
'suggests',
- pr.sense,
+ sugg.sense,
pc.name,
pc.version
from
commit bb86448d7f2734e4d775cbd2d77a3d9d6a349107
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 24 14:24:21 2011 +0200
channel timestamp expects YYYYMMDDHHMISS
fixing
Traceback (most recent call last):
File "bug", line 41, in <module>
repo.get_repomd_file()
File "/usr/lib/python2.6/site-packages/spacewalk/server/repomd/repository.py", line 333, in get_repomd_file
...
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnCache.py", line 259, in has_key
modified = timestamp(modified)
File "/usr/lib/python2.6/site-packages/spacewalk/common/rhnLib.py", line 84, in timestamp
raise TypeError("String '%s' is not a YYYYMMDDHHMISS" % s)
TypeError: String '201105231718140400' is not a YYYYMMDDHHMISS
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index 8d5f962..abf322d 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -62,7 +62,7 @@ class ChannelMapper:
self.last_modified_sql = rhnSQL.prepare("""
select
- last_modified
+ to_char(last_modified, 'YYYYMMDDHH24MISS') as last_modified
from
rhnChannel
where id = :channel_id
13 years
rel-eng/tito.props
by Miroslav Suchý
rel-eng/tito.props | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 54fdb7b519b013bda22fa6fe4b7d8a49493d6466
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 25 09:53:22 2011 +0200
block python-hwdata
we are upstream, but there is no need to build every release (if there will be some) in Spacewalk.
it can go directly to Fedora and then to EPEL.
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
index a7a1e26..4879b25 100644
--- a/rel-eng/tito.props
+++ b/rel-eng/tito.props
@@ -9,12 +9,12 @@ autobuild_tags = dist-5E-sw-1.5-candidate dist-6E-sw-1.5-candidate dist-f14-sw-1
[dist-5E-sw-1.5-candidate]
disttag = .el5
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
[dist-6E-sw-1.5-candidate]
disttag = .el6
-blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools jabberd-selinux apt-spacewalk
+blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools jabberd-selinux apt-spacewalk python-hwdata
[dist-f14-sw-1.5-candidate]
disttag = .fc14
-blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk
+blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm jabberd-selinux-workaround python-ethtool msv-workaround apt-spacewalk python-hwdata
13 years
Changes to 'refs/tags/spacewalk-web-1.5.13-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-web] version [1.5.13-1] in directory [web/].
Changes since spacewalk-schema-1.5.5-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.13-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
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 c746c159f499e1ef94936353e73807b498dce039
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:56 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8a6bd0d..8b0b19a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.12-1 web/
+1.5.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e63c925..8c8a669 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.12
+Version: 1.5.13
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
+* Tue May 24 2011 Jan Pazdziora 1.5.13-1
+- replaced (+) with ANSI left join (je(a)rockenstein.de)
+
* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.12-1
- made queries PostgreSQL compatible
13 years
Changes to 'refs/tags/spacewalk-schema-1.5.5-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.5.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-schema] version [1.5.5-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.5.35-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.5.5-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c98f32d31ac536d9f6c7bb3e4d3c18ff8be9e5c8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:35 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3f11fb7..dc49e88 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.5.4-1 schema/spacewalk/
+1.5.5-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fa35ed9..d5cc026 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.5.4
+Version: 1.5.5
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.5-1
+- 679333 - update rhnPushClient when deleting server (mzazrivec(a)redhat.com)
+
* Wed Apr 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.4-1
- in postgres we should upgrade only the affected function
13 years
Changes to 'refs/tags/spacewalk-java-1.5.35-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.35-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:59 +0000
Tagging package [spacewalk-java] version [1.5.35-1] in directory [java/].
Changes since spacewalk-backend-1.5.28-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.35-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e2ce3d0cf22e59fb5fc29941f4b1ab78d5146c2f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:59:10 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.35-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a633e18..d3e1159 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.5.34
+Version: 1.5.35
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.35-1
+- 703273 - check, whether subscription is possible (tlestach(a)redhat.com)
+
* Fri May 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.34-1
- 659138 - extend schedule creation error handling (tlestach(a)redhat.com)
- 659138 - do not forward parameter map in case of success
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b523448..4d8632c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.34-1 java/
+1.5.35-1 java/
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.28-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-24 11:58 +0000
Tagging package [spacewalk-backend] version [1.5.28-1] in directory [backend/].
Changes since rhn-client-tools-1.5.8-1:
Jan Pazdziora (2):
We need to specifically check for None when calling decode.
Automatic commit of package [spacewalk-backend] release [1.5.28-1].
---
backend/server/importlib/packageImport.py | 2 ++
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 90ed91246181c5bf20b89e5e2666860affbc1b5d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:58:30 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.28-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bfd4ebe..6ec0c84 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.27
+Version: 1.5.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 24 2011 Jan Pazdziora 1.5.28-1
+- We need to specifically check for None when calling decode.
+
* Fri May 20 2011 Jan Pazdziora 1.5.27-1
- Removing %{pythonrhnroot}/common/UserDictCase.py* from %files.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 30004c1..b8df06b 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.27-1 backend/
+1.5.28-1 backend/
13 years
backend/server
by Jan Pazdziora
backend/server/importlib/packageImport.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a7e2877841f4ac5bc47c28ba0320deb496f3408a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 24 13:56:56 2011 +0200
We need to specifically check for None when calling decode.
Addressing
File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/importLib.py", line 623, in run
self.preprocess()
File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py", line 58, in preprocess
self._processPackage(package)
File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py", line 275, in _processPackage
package['description'] = self._fix_encoding(package['description'])
File "/usr/lib/python2.6/site-packages/spacewalk/server/importlib/packageImport.py", line 506, in _fix_encoding
return text.decode('utf8')
AttributeError: 'NoneType' object has no attribute 'decode'
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 7432d1d..d01cf86 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -502,6 +502,8 @@ class PackageImport(ChannelPackageSubscription):
package['checksum_type'], package['checksum'])
def _fix_encoding(self, text):
+ if text is None:
+ return None
try:
return text.decode('utf8')
except UnicodeDecodeError:
13 years
Changes to 'refs/tags/rhn-client-tools-1.5.8-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.5.8-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-23 15:59 +0000
Tagging package [rhn-client-tools] version [1.5.8-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.5.34-1:
Jan Blazek (1):
remove python-hwdata from comps
Julian Einwag (1):
replaced (+) with ANSI left join
Miroslav Suchý (3):
683200 - if I want url in unicode, I must us decode - remember that
683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works and is idempotent
Automatic commit of package [rhn-client-tools] release [1.5.8-1].
Tomas Lestach (1):
703273 - check, whether subscription is possible
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 ++++-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2 -
java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java | 12 +++++++
rel-eng/comps/comps-spacewalk-client-fedora13.xml | 1
rel-eng/comps/comps-spacewalk-client-fedora14.xml | 1
rel-eng/comps/comps-spacewalk-client-rhel5.xml | 1
rel-eng/comps/comps-spacewalk-client-rhel6.xml | 1
rel-eng/packages/rhn-client-tools | 2 -
web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml | 14 ++++----
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 16 +++++-----
10 files changed, 36 insertions(+), 22 deletions(-)
---
13 years
3 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 +++++++-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2 +-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit bd91a9e57025185f04130540b01e45426a198631
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 17:59:41 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.8-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index c881ced..2da946f 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.5.7
+Version: 1.5.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,12 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon May 23 2011 Miroslav Suchý 1.5.8-1
+- 683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works
+ and is idempotent (msuchy(a)redhat.com)
+- 683200 - if I want url in unicode, I must us decode - remember that
+ (msuchy(a)redhat.com)
+
* Thu Apr 28 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.7-1
- The Debian client on x86_64 should send amd64-debian-linux
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index eab29fd..a5889a3 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.7-1 client/rhel/rhn-client-tools/
+1.5.8-1 client/rhel/rhn-client-tools/
commit 1e04949035cac72489ed757017418cb990fb2110
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 17:03:53 2011 +0200
683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works and is idempotent
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn_register", line 76, in ?
app.run()
File "/usr/share/rhn/up2date_client/rhncli.py", line 74, in run
sys.exit(self.main() or 0)
File "/usr/sbin/rhn_register", line 58, in main
ui.main()
File "/usr/share/rhn/up2date_client/tui.py", line 1263, in main
tui.run()
File "/usr/share/rhn/up2date_client/tui.py", line 1211, in run
win = self.windows[index](self.screen, self)
File "/usr/share/rhn/up2date_client/tui.py", line 126, in __init__
(SYSTEM_ALREADY_REGISTERED + "\n\n"
File "/usr/share/rhn/up2date_client/config.py", line 299, in convert_url_from_pune
return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])).decode('utf-8')
File "/usr/lib/python2.4/encodings/utf_8.py", line 16, in decode
return codecs.utf_8_decode(input, errors, True)
exceptions.UnicodeEncodeError: 'ascii' codec can't encode character u'\u017e' in position 8: ordinal not in range(128)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 7bbd239..f51e8e5 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -296,7 +296,7 @@ def convert_url_to_pune(url):
def convert_url_from_pune(url):
""" returns url where hostname is converted from Pune encoding. Returns unicode string. """
s = urlsplit(url)
- return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])).decode('utf-8')
+ return unicode(urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])))
def getServerlURL():
""" return list of serverURL from config
commit 9f25ce2ddd44b068b5f3e464fcfdc97f3d83f957
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 16:55:59 2011 +0200
683200 - if I want url in unicode, I must us decode - remember that
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 8efe530..7bbd239 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -296,7 +296,7 @@ def convert_url_to_pune(url):
def convert_url_from_pune(url):
""" returns url where hostname is converted from Pune encoding. Returns unicode string. """
s = urlsplit(url)
- return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])).encode('utf-8')
+ return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])).decode('utf-8')
def getServerlURL():
""" return list of serverURL from config
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java | 12 ++++++++++
1 file changed, 12 insertions(+)
New commits:
commit de86594b87ed8877707594356845ef44e4aa08e7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 23 13:50:07 2011 +0200
703273 - check, whether subscription is possible
and report troubles instead of ISE
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
index c19845b..5ec2953 100755
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
@@ -31,6 +31,7 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -69,8 +70,19 @@ public class TargetSystemsConfirmAction extends RhnAction implements Listable {
request.setAttribute("cid", chan.getId());
if (helper.isDispatched()) {
RhnSet set = TargetSystemsAction.getSetDecl(chan).get(user);
+ List<Server> servers = new ArrayList<Server>();
for (Long id : set.getElementValues()) {
Server s = SystemManager.lookupByIdAndUser(id, user);
+ if (!SystemManager.canServerSubscribeToChannel(user.getOrg(), s, chan)) {
+ createErrorMessage(request, "api.channel.software.channelsubscription",
+ s.getHostname());
+ // even if it's not success, the redirect is what we need
+ return getStrutsDelegate().forwardParams(mapping.findForward("success"),
+ request.getParameterMap());
+ }
+ servers.add(s);
+ }
+ for (Server s : servers) {
SystemManager.subscribeServerToChannel(user, s, chan);
}
Map params = new HashMap();
13 years
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml | 14 ++++++------
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 16 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit a33862b1ef130e322f46a1018a6d37f997e79774
Author: Julian Einwag <je(a)rockenstein.de>
Date: Fri May 20 14:28:37 2011 +0200
replaced (+) with ANSI left join
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
index 7df3ca8..de68eb0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
@@ -9,8 +9,9 @@ SELECT SA.action_id AS ID,
AType.name AS history_type_name
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON A.scheduler = U.id,
rhnServerAction SA,
rhnSet ST
WHERE ST.user_id = :user_id
@@ -20,7 +21,6 @@ SELECT SA.action_id AS ID,
AND SA.action_id = A.id
AND AType.id = A.action_type
AND AStat.id = SA.status
- AND A.scheduler = U.id (+)
AND AStat.id = 0
</query>
</mode>
@@ -112,15 +112,15 @@ SELECT EVENT_ID, TO_CHAR(CREATED, 'YYYY-MM-DD HH24:MI:SS') CREATED, SUMMARY
SA.created
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON U.id = A.scheduler,
rhnServerAction SA
WHERE SA.server_id = :support_sid
AND SA.action_id = A.id
AND ATYPE.id = A.action_type
AND AStat.id = SA.status
- AND U.id(+) = A.scheduler
- )
+ ) X
ORDER BY CREATED DESC, EVENT_ID DESC
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 59863f3..17d4adb 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -590,9 +590,11 @@ SELECT P2.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' ||
rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageEVR PE2,
- rhnErrata E,
- rhnErrataPackage EP,
- rhnPackage P2,
+ rhnPackage P2
+ LEFT JOIN rhnErrataPackage EP
+ ON P2.id = EP.package_id
+ LEFT JOIN rhnErrata E
+ ON E.id = EP.errata_id,
rhnAvailableChannels AC,
rhnChannelPackage CP2,
rhnChannelPackage CP1,
@@ -605,10 +607,8 @@ SELECT P2.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '-' ||
and ac.channel_id = cp2.channel_id
and p1.name_id = p2.name_id
AND cp2.package_id = P2.id
- AND P2.id = EP.package_id(+)
AND p2.evr_id = PE.id
AND PE2.id = P1.evr_id
- AND E.id(+) = EP.errata_id
and pe.id != pe2.id
AND PE.evr >= PE2.evr
-- after here is just for output
@@ -1421,11 +1421,12 @@ SELECT P.id AS ID,
E.advisory,
E.id AS ADVISORY_ID,
COUNT(DISTINCT SNPC.server_id) NUM_SYSTEMS
- FROM rhnErrata E,
+ FROM rhnServerNeededPackageCache SNPC
+ LEFT JOIN rhnErrata E
+ ON SNPC.errata_id = E.id,
rhnPackageEVR PE,
rhnPackageName PN,
rhnPackage P,
- rhnServerNeededPackageCache SNPC,
rhnSet S
WHERE S.user_id = :user_id
AND S.label = 'system_list'
@@ -1433,7 +1434,6 @@ SELECT P.id AS ID,
AND SNPC.package_id = P.id
AND P.name_id = PN.id
AND P.evr_id = PE.id
- AND SNPC.errata_id = E.id (+)
AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatch SP WHERE
SP.package_id = P.id)
AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchSet SPS WHERE
13 years
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-client-fedora13.xml | 1 -
rel-eng/comps/comps-spacewalk-client-fedora14.xml | 1 -
rel-eng/comps/comps-spacewalk-client-rhel5.xml | 1 -
rel-eng/comps/comps-spacewalk-client-rhel6.xml | 1 -
4 files changed, 4 deletions(-)
New commits:
commit a791409e92570468eaf753cb1b680906f7223257
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Mon May 23 08:46:53 2011 +0200
remove python-hwdata from comps
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora13.xml b/rel-eng/comps/comps-spacewalk-client-fedora13.xml
index 2e3f9c4..d8b5c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-client-fedora13.xml
@@ -31,7 +31,6 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
- <packagereq type="default">python-hwdata</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-fedora14.xml b/rel-eng/comps/comps-spacewalk-client-fedora14.xml
index 2e3f9c4..d8b5c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-client-fedora14.xml
@@ -31,7 +31,6 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
- <packagereq type="default">python-hwdata</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel5.xml b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
index 2e3f9c4..d8b5c4c 100644
--- a/rel-eng/comps/comps-spacewalk-client-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-client-rhel5.xml
@@ -31,7 +31,6 @@
<packagereq type="default">spacewalk-certs-tools</packagereq>
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
- <packagereq type="default">python-hwdata</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel6.xml b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
index 4a238c1..1979d03 100644
--- a/rel-eng/comps/comps-spacewalk-client-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
@@ -32,7 +32,6 @@
<packagereq type="default">spacewalk-client-repo</packagereq>
<packagereq type="default">spacewalk-backend-libs</packagereq>
<packagereq type="default">python-ethtool</packagereq>
- <packagereq type="default">python-hwdata</packagereq>
</packagelist>
</group>
</comps>
13 years
Changes to 'refs/tags/spacewalk-java-1.5.34-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.34-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-20 18:09 +0000
Tagging package [spacewalk-java] version [1.5.34-1] in directory [java/].
Changes since spacewalk-backend-1.5.27-1:
Milan Zazrivec (1):
679333 - update rhnPushClient when deleting server
Tomas Lestach (4):
706399 - "<" is not the best thing in xml
659138 - do not forward parameter map in case of success
659138 - extend schedule creation error handling
Automatic commit of package [spacewalk-java] release [1.5.34-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 6
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 58 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 18
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 16
java/spacewalk-java.spec | 8
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/oracle/procs/delete_server.sql | 2
schema/spacewalk/postgres/procs/delete_server.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle | 238 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql | 240 ++++++++++
11 files changed, 572 insertions(+), 20 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 922037c8d2d8da3b78e02d76fd622c7267643c20
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 20:09:21 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.34-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 79b2163..a633e18 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.5.33
+Version: 1.5.34
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.34-1
+- 659138 - extend schedule creation error handling (tlestach(a)redhat.com)
+- 659138 - do not forward parameter map in case of success
+ (tlestach(a)redhat.com)
+- 706399 - "<" is not the best thing in xml (tlestach(a)redhat.com)
+
* Fri May 20 2011 Jan Pazdziora 1.5.33-1
- 706399 - replacing rhnServerNeededView with custom subselect
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index eb22bf3..b523448 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.33-1 java/
+1.5.34-1 java/
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 58 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 18 +++
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 16 ++
3 files changed, 78 insertions(+), 14 deletions(-)
New commits:
commit 8cfa182beb513179efd62338c4202d30c55004cd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 16:21:06 2011 +0200
659138 - extend schedule creation error handling
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
index db7c810..f7bfbe9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -32,6 +32,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -43,6 +44,8 @@ import javax.servlet.http.HttpServletResponse;
*/
public class ScheduleDetailAction extends RhnAction {
+ static final String SCHEDULE_NAME_REGEX = "^[a-z\\d][a-z\\d\\-\\.\\_]*$";
+
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
@@ -100,40 +103,67 @@ public class ScheduleDetailAction extends RhnAction {
mapping.findForward("disable"), params);
}
- String scheduleName = form.getString("schedulename");
String bunchName = form.getString("bunch");
+ String scheduleName = form.getString("schedulename");
+ if (!Pattern.compile(SCHEDULE_NAME_REGEX).matcher(scheduleName).find()) {
+ createErrorMessage(request, "schedule.jsp.schedulenameregex", null);
+
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
+ }
try {
TaskomaticApi tapi = new TaskomaticApi();
+ // check, whether there's not already a schedule of this name
+ if (scheduleId == null && tapi.satScheduleActive(scheduleName, loggedInUser)) {
+ createErrorMessage(request,
+ "schedule.jsp.schedulenameinuse", scheduleName);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
+ }
+ // set the schedule
tapi.scheduleSatBunch(loggedInUser,
scheduleName,
bunchName,
picker.getCronEntry()
);
- if (ctx.hasParam("create_button")) {
- createSuccessMessage(request, "message.schedulecreated", scheduleName);
- }
- else {
- createSuccessMessage(request, "message.scheduleupdated", scheduleName);
- }
+ // check, whether it was created
Map schedule = tapi.lookupScheduleByBunchAndLabel(loggedInUser, bunchName,
scheduleName);
- params.put("schid", schedule.get("id"));
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"), params);
+ if (schedule != null) {
+ if (ctx.hasParam("create_button")) {
+ createSuccessMessage(request, "message.schedulecreated", scheduleName);
+ }
+ else {
+ createSuccessMessage(request, "message.scheduleupdated", scheduleName);
+ }
+ params.put("schid", schedule.get("id"));
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"), params);
+ }
+ // something went wrong
+ tapi.unscheduleSatTask(scheduleName, loggedInUser);
+ createErrorMessage(request,
+ "schedule.jsp.schedulefailed", scheduleName);
}
catch (TaskomaticApiException e) {
if (e.getMessage().contains("InvalidParamException")) {
- createErrorMessage(request,
- "repos.jsp.message.invalidcron", picker.getCronEntry());
+ if (e.getMessage().contains("Cron trigger")) {
+ createErrorMessage(request,
+ "repos.jsp.message.invalidcron", picker.getCronEntry());
+ }
+ else {
+ createErrorMessage(request,
+ "schedule.jsp.schedulefailed", scheduleName);
+ }
}
else {
createErrorMessage(request,
"repos.jsp.message.taskomaticdown", null);
}
- return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
}
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
}
private Boolean isActive(Map schedule) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 14f72b9..1cf501e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -22843,6 +22843,24 @@ given channel.</source>
<context context-type="sourcefile">/rhn/admin/DeleteSchedule.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedule.jsp.schedulenameinuse">
+ <source>Schedule name {0} is already in use. Please choose another one.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.jsp.schedulenameregex">
+ <source>Schedule name must begin with a letter and may contain only lowercase letters, hyphens ('-'), periods ('.'), underscores ('_'), and numerals.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.jsp.schedulefailed">
+ <source>Setting of {0} schedule failed.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="schedule.edit.jsp.toolbar">
<source>Schedule {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
index 838d7fd..5345f0c 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
@@ -226,6 +226,22 @@ public class TaskomaticApi {
}
/**
+ * Check whether there's an active schedule of given job label
+ * @param jobLabel job label
+ * @param user the user
+ * @return true, if schedule exists
+ */
+ public boolean satScheduleActive(String jobLabel, User user) {
+ List<Map> schedules = (List<Map>) invoke("tasko.listActiveSatSchedules");
+ for (Map schedule : schedules) {
+ if (schedule.get("job_label").equals(jobLabel)) {
+ return Boolean.TRUE;
+ }
+ }
+ return Boolean.FALSE;
+ }
+
+ /**
* Get the cron format for a single channel
* @param chan the channel
* @param user the user
13 years
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 669cd9890f5717e72fe8f76b56906c58b55f0b46
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 15:26:46 2011 +0200
659138 - do not forward parameter map in case of success
(we would forward also submitted param, that confuses csfr token check
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
index 9c4af32..923063b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
@@ -79,7 +79,7 @@ public class DeleteScheduleAction extends RhnAction {
}
return getStrutsDelegate().forwardParams(
mapping.findForward("success"),
- request.getParameterMap());
+ new HashMap());
}
catch (TaskomaticApiException e) {
createErrorMessage(request,
commit 210dbc4a9669ea5b381787791a90d5f26408a254
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 18:50:50 2011 +0200
706399 - "<" is not the best thing in xml
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index caf9ddf..e038aa1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -165,7 +165,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
where cp.channel_id = csc.channel_id
and rhnChannelNewestPackage.package_id = cp.package_id
and rhnServerChannel.server_id = csc.server_id
- and cp.channel_id < rhnChannelNewestPackage.channel_id
+ and cp.channel_id < rhnChannelNewestPackage.channel_id
)
and not exists (
-- rule out records where the server has the same package name with higher evr
@@ -173,7 +173,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
where rhnServerPackage.server_id = sp.server_id
and rhnServerPackage.name_id = sp.name_id
and sp.evr_id = sevr.id
- and rhnPackageEVR.evr <= sevr.evr
+ and rhnPackageEVR.evr <= sevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = sp.package_arch_id
)
@@ -184,7 +184,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and csc.channel_id = ocnp.channel_id
and rhnServerPackage.name_id = ocnp.name_id
and ocnp.evr_id = oevr.id
- and rhnPackageEVR.evr < oevr.evr
+ and rhnPackageEVR.evr < oevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = ocnp.package_arch_id
)
13 years
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/procs/delete_server.sql | 2
schema/spacewalk/postgres/procs/delete_server.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle | 238 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql | 240 ++++++++++
4 files changed, 482 insertions(+)
New commits:
commit 90e5ec5daa5d5e45b111a65d714fbe4ebe9791e5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 20 16:32:48 2011 +0200
679333 - update rhnPushClient when deleting server
diff --git a/schema/spacewalk/oracle/procs/delete_server.sql b/schema/spacewalk/oracle/procs/delete_server.sql
index c9abd56..afd104a 100644
--- a/schema/spacewalk/oracle/procs/delete_server.sql
+++ b/schema/spacewalk/oracle/procs/delete_server.sql
@@ -232,6 +232,8 @@ begin
( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
-- now get rhnServer itself.
delete
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql
index 2c01408..ad35b39 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -236,6 +236,8 @@ begin
delete from rhn_sat_node where server_id = server_id_in;
+ delete from rhnPushClient where server_id = server_id_in;
+
-- now get rhnServer itself.
delete
from rhnServer
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle
new file mode 100644
index 0000000..4e1cc4d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.oracle
@@ -0,0 +1,238 @@
+create or replace
+procedure delete_server (
+ server_id_in in number
+) is
+ cursor servergroups is
+ select server_id, server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in;
+ cursor configchannels is
+ select cc.id
+ from rhnConfigChannel cc,
+ rhnConfigChannelType cct,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ -- these config channel types are reserved
+ -- for use by a single server, so we don't
+ -- need to check for other servers subscribed
+ and cct.label in
+ ('local_override','server_import')
+ and cct.id = cc.confchan_type_id;
+ type filelistsid_t is table of rhnServerPreserveFileList.file_list_id%type;
+ filelistsid_c filelistsid_t;
+
+ type probesid_t is table of rhn_check_probe.probe_id%type;
+ probesid_c probesid_t;
+
+ is_virt number := 0;
+begin
+ rhn_channel.delete_server_channels(server_id_in);
+ -- rhn_channel.clear_subscriptions(server_id_in);
+
+ -- filelists
+ select spfl.file_list_id id bulk collect into filelistsid_c
+ from rhnServerPreserveFileList spfl
+ where spfl.server_id = server_id_in
+ and not exists (
+ select 1
+ from rhnServerPreserveFileList
+ where file_list_id = spfl.file_list_id
+ and server_id != server_id_in
+ union
+ select 1
+ from rhnKickstartPreserveFileList
+ where file_list_id = spfl.file_list_id
+ );
+ if filelistsid_c.first is not null then
+ forall i in filelistsid_c.first..filelistsid_c.last
+ delete from rhnFileList where id = filelistsid_c(i);
+ end if;
+
+ for configchannel in configchannels loop
+ rhn_config.delete_channel(configchannel.id);
+ end loop;
+
+ select count(1) into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform')
+ and rownum <= 1;
+
+ for sgm in servergroups loop
+ rhn_server.delete_from_servergroup(
+ sgm.server_id, sgm.server_group_id);
+ end loop;
+
+ if is_virt = 1 then
+ rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ -- we're handling this instead of letting an "on delete
+ -- set null" do it so that we don't run the risk
+ -- of setting off the triggers and killing us with a
+ -- mutating table
+
+ -- this is merge of two single updates:
+ -- update ... set old_server_id = null where old_server_id = server_id_in;
+ -- update ... set new_server_id = null where new_server_id = server_id_in;
+ -- so we scan rhnKickstartSession table only once
+ update rhnKickstartSession
+ set old_server_id = case when old_server_id = server_id_in then null else old_server_id end,
+ new_server_id = case when new_server_id = server_id_in then null else new_server_id end
+ where old_server_id = server_id_in
+ or new_server_id = server_id_in;
+
+ rhn_channel.clear_subscriptions(server_id_in,1);
+
+ -- A little complicated here, but the goal is to
+ -- delete records from rhnVirtualInstace only if we don't
+ -- care about them anymore. We don't care about records
+ -- in rhnVirtualInstance if we are deleting the host
+ -- system and the virtual system is already null, or
+ -- vice-versa. We *do* care about them if either the
+ -- host or virtual system is still registered because we
+ -- still want them to show up in the UI.
+ -- If there's a newer row in rhnVirtualInstance with the same
+ -- uuid, this guest must have been re-registered, so we can clean
+ -- this data up.
+
+ delete from rhnVirtualInstance vi
+ where (host_system_id = server_id_in and virtual_system_id is null)
+ or (virtual_system_id = server_id_in and host_system_id is null)
+ or (vi.virtual_system_id = server_id_in and vi.modified < (select max(vi2.modified)
+ from rhnVirtualInstance vi2 where vi2.uuid = vi.uuid));
+
+ -- this is merge of two single updates:
+ -- update ... set host_system_id = null where host_system_id = server_id_in;
+ -- update ... set virtual_system_id = null where virtual_system_id = server_id_in;
+ -- so we scan rhnVirtualInstance table only once
+ update rhnVirtualInstance
+ set host_system_id = case when host_system_id = server_id_in then null else host_system_id end,
+ virtual_system_id = case when virtual_system_id = server_id_in then null else virtual_system_id end
+ where host_system_id = server_id_in
+ or virtual_system_id = server_id_in;
+
+ -- this is merge of two single updates:
+ -- update ... set old_host_system_id = null when old_host_system_id = server_id_in;
+ -- update ... set new_host_system_id = null when new_host_system_id = server_id_in;
+ -- so we scan rhnVirtualInstanceEventLog table only once
+ update rhnVirtualInstanceEventLog
+ set old_host_system_id = case when old_host_system_id = server_id_in then null else old_host_system_id end,
+ new_host_system_id = case when new_host_system_id = server_id_in then null else new_host_system_id end
+ where old_host_system_id = server_id_in
+ or new_host_system_id = server_id_in;
+
+ -- We're deleting everything with a foreign key to rhnServer
+ -- here, now. I'm hoping this will help aleviate our deadlock
+ -- problem.
+
+ delete from rhnActionConfigChannel where server_id = server_id_in;
+ delete from rhnActionConfigRevision where server_id = server_id_in;
+ delete from rhnActionPackageRemovalFailure where server_id = server_id_in;
+ delete from rhnClientCapability where server_id = server_id_in;
+ delete from rhnCpu where server_id = server_id_in;
+ -- there's still a cascade here, because the constraint keeps the
+ -- table locked for too long to rebuild it. Ugh...
+ delete from rhnDevice where server_id = server_id_in;
+ delete from rhnProxyInfo where server_id = server_id_in;
+ delete from rhnRam where server_id = server_id_in;
+ delete from rhnRegToken where server_id = server_id_in;
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ -- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
+ delete from rhnServerAction where server_id = server_id_in;
+ delete from rhnServerActionPackageResult where server_id = server_id_in;
+ delete from rhnServerActionScriptResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyMissing where server_id = server_id_in;
+ -- counts are handled above. this should be a delete_ function.
+ delete from rhnServerChannel where server_id = server_id_in;
+ delete from rhnServerConfigChannel where server_id = server_id_in;
+ delete from rhnServerCustomDataValue where server_id = server_id_in;
+ delete from rhnServerDMI where server_id = server_id_in;
+ delete from rhnServerEvent where server_id = server_id_in;
+ delete from rhnServerHistory where server_id = server_id_in;
+ delete from rhnServerInfo where server_id = server_id_in;
+ delete from rhnServerInstallInfo where server_id = server_id_in;
+ delete from rhnServerLocation where server_id = server_id_in;
+ delete from rhnServerLock where server_id = server_id_in;
+ delete from rhnServerNeededCache where server_id = server_id_in;
+ delete from rhnServerNetwork where server_id = server_id_in;
+ delete from rhnServerNotes where server_id = server_id_in;
+ -- I'm not removing the foreign key from rhnServerPackage; that'll
+ -- take forever. Do the delete anyway.
+ delete from rhnServerPackage where server_id = server_id_in;
+ delete from rhnServerTokenRegs where server_id = server_id_in;
+ delete from rhnSnapshotTag where server_id = server_id_in;
+ -- this cascades to:
+ -- rhnSnapshotChannel, rhnSnapshotConfigChannel, rhnSnapshotPackage,
+ -- rhnSnapshotConfigRevision, rhnSnapshotServerGroup,
+ -- rhnSnapshotTag.
+ -- We may want to consider delete_snapshot() at some point, but
+ -- I don't think we need to yet.
+ delete from rhnSnapshot where server_id = server_id_in;
+ delete from rhnUserServerPrefs where server_id = server_id_in;
+ -- hrm, this one's interesting... we _probably_ should delete
+ -- everything for the parent server_id when we delete the proxy,
+ -- but we don't currently.
+ delete from rhnServerPath where server_id_in in (server_id, proxy_server_id);
+ delete from rhnUserServerPerms where server_id = server_id_in;
+
+ delete from rhnServerNetInterface where server_id = server_id_in;
+ delete from rhn_server_monitoring_info where recid = server_id_in;
+
+ delete from rhnAppInstallSession where server_id = server_id_in;
+ delete from rhnServerUuid where server_id = server_id_in;
+ -- We delete all the probes running directly against this system
+ -- and any probes that were using this Server as a Proxy Scout.
+ SELECT CP.probe_id bulk collect into probesid_c
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in);
+
+ if probesid_c.first is not null then
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE FROM rhn_probe_state PS WHERE PS.probe_id = probesid_c(i);
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE FROM rhn_probe P WHERE P.recid = probesid_c(i);
+ FORALL i IN probesid_c.first..probesid_c.last
+ DELETE /*+index(time_series time_series_probe_id_idx)*/
+ FROM time_series
+ WHERE substr(o_id, instr(o_id, '-') + 1,
+ (instr(o_id, '-', instr(o_id, '-') + 1) - instr(o_id, '-')) - 1) = probesid_c(i);
+ end if;
+
+ delete from rhn_check_probe where host_id = server_id_in;
+ delete from rhn_host_probe where host_id = server_id_in;
+
+ delete from rhn_sat_cluster where recid in
+ ( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
+
+ delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
+
+ -- now get rhnServer itself.
+ delete
+ from rhnServer
+ where id = server_id_in;
+
+ delete
+ from rhnSet
+ where 1=1
+ and user_id in (
+ select wc.id
+ from rhnServer rs,
+ web_contact wc
+ where rs.id = server_id_in
+ and rs.org_id = wc.org_id
+ )
+ and label = 'system_list'
+ and element = server_id_in;
+end delete_server;
+/
+show errors;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql
new file mode 100644
index 0000000..55c6067
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.4-to-spacewalk-schema-1.5/017-rhn_server.pkb.sql.postgresql
@@ -0,0 +1,240 @@
+create or replace
+function delete_server (
+ server_id_in in numeric
+) returns void
+as
+$$
+declare
+ servergroups cursor for
+ select server_id, server_group_id
+ from rhnServerGroupMembers sgm
+ where sgm.server_id = server_id_in;
+
+ configchannels cursor for
+ select cc.id
+ from rhnConfigChannel cc,
+ rhnConfigChannelType cct,
+ rhnServerConfigChannel scc
+ where 1=1
+ and scc.server_id = server_id_in
+ and scc.config_channel_id = cc.id
+ -- these config channel types are reserved
+ -- for use by a single server, so we don't
+ -- need to check for other servers subscribed
+ and cct.label in
+ ('local_override','server_import')
+ and cct.id = cc.confchan_type_id;
+
+ is_virt boolean;
+begin
+ perform rhn_channel.delete_server_channels(server_id_in);
+ -- rhn_channel.clear_subscriptions(server_id_in);
+
+ -- filelists
+ delete from rhnFileList where id in (
+ select spfl.file_list_id
+ from rhnServerPreserveFileList spfl
+ where spfl.server_id = server_id_in
+ and not exists (
+ select 1
+ from rhnServerPreserveFileList
+ where file_list_id = spfl.file_list_id
+ and server_id != server_id_in
+ union all
+ select 1
+ from rhnKickstartPreserveFileList
+ where file_list_id = spfl.file_list_id
+ )
+ );
+
+ for configchannel in configchannels loop
+ perform rhn_config.delete_channel(configchannel.id);
+ end loop;
+
+ is_virt := exists (
+ select 1
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform')
+ );
+
+ for sgm in servergroups loop
+ perform rhn_server.delete_from_servergroup(
+ sgm.server_id, sgm.server_group_id);
+ end loop;
+
+ if is_virt then
+ perform rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ -- we're handling this instead of letting an "on delete
+ -- set null" do it so that we don't run the risk
+ -- of setting off the triggers and killing us with a
+ -- mutating table
+
+ -- this is merge of two single updates:
+ -- update ... set old_server_id = null where old_server_id = server_id_in;
+ -- update ... set new_server_id = null where new_server_id = server_id_in;
+ -- so we scan rhnKickstartSession table only once
+ update rhnKickstartSession
+ set old_server_id = case when old_server_id = server_id_in then null else old_server_id end,
+ new_server_id = case when new_server_id = server_id_in then null else new_server_id end
+ where old_server_id = server_id_in
+ or new_server_id = server_id_in;
+
+ perform rhn_channel.clear_subscriptions(server_id_in,1);
+
+ -- A little complicated here, but the goal is to
+ -- delete records from rhnVirtualInstace only if we don't
+ -- care about them anymore. We don't care about records
+ -- in rhnVirtualInstance if we are deleting the host
+ -- system and the virtual system is already null, or
+ -- vice-versa. We *do* care about them if either the
+ -- host or virtual system is still registered because we
+ -- still want them to show up in the UI.
+ -- If there's a newer row in rhnVirtualInstance with the same
+ -- uuid, this guest must have been re-registered, so we can clean
+ -- this data up.
+
+ delete from rhnVirtualInstance vi
+ where (host_system_id = server_id_in and virtual_system_id is null)
+ or (virtual_system_id = server_id_in and host_system_id is null)
+ or (vi.virtual_system_id = server_id_in and vi.modified < (select max(vi2.modified)
+ from rhnVirtualInstance vi2 where vi2.uuid = vi.uuid));
+
+ -- this is merge of two single updates:
+ -- update ... set host_system_id = null where host_system_id = server_id_in;
+ -- update ... set virtual_system_id = null where virtual_system_id = server_id_in;
+ -- so we scan rhnVirtualInstance table only once
+ update rhnVirtualInstance
+ set host_system_id = case when host_system_id = server_id_in then null else host_system_id end,
+ virtual_system_id = case when virtual_system_id = server_id_in then null else virtual_system_id end
+ where host_system_id = server_id_in
+ or virtual_system_id = server_id_in;
+
+ -- this is merge of two single updates:
+ -- update ... set old_host_system_id = null when old_host_system_id = server_id_in;
+ -- update ... set new_host_system_id = null when new_host_system_id = server_id_in;
+ -- so we scan rhnVirtualInstanceEventLog table only once
+ update rhnVirtualInstanceEventLog
+ set old_host_system_id = case when old_host_system_id = server_id_in then null else old_host_system_id end,
+ new_host_system_id = case when new_host_system_id = server_id_in then null else new_host_system_id end
+ where old_host_system_id = server_id_in
+ or new_host_system_id = server_id_in;
+
+ -- We're deleting everything with a foreign key to rhnServer
+ -- here, now. I'm hoping this will help aleviate our deadlock
+ -- problem.
+
+ delete from rhnActionConfigChannel where server_id = server_id_in;
+ delete from rhnActionConfigRevision where server_id = server_id_in;
+ delete from rhnActionPackageRemovalFailure where server_id = server_id_in;
+ delete from rhnClientCapability where server_id = server_id_in;
+ delete from rhnCpu where server_id = server_id_in;
+ -- there's still a cascade here, because the constraint keeps the
+ -- table locked for too long to rebuild it. Ugh...
+ delete from rhnDevice where server_id = server_id_in;
+ delete from rhnProxyInfo where server_id = server_id_in;
+ delete from rhnRam where server_id = server_id_in;
+ delete from rhnRegToken where server_id = server_id_in;
+ delete from rhnSatelliteInfo where server_id = server_id_in;
+ -- this cascades to rhnActionConfigChannel and rhnActionConfigFileName
+ delete from rhnServerAction where server_id = server_id_in;
+ delete from rhnServerActionPackageResult where server_id = server_id_in;
+ delete from rhnServerActionScriptResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyResult where server_id = server_id_in;
+ delete from rhnServerActionVerifyMissing where server_id = server_id_in;
+ -- counts are handled above. this should be a delete_ function.
+ delete from rhnServerChannel where server_id = server_id_in;
+ delete from rhnServerConfigChannel where server_id = server_id_in;
+ delete from rhnServerCustomDataValue where server_id = server_id_in;
+ delete from rhnServerDMI where server_id = server_id_in;
+ delete from rhnServerEvent where server_id = server_id_in;
+ delete from rhnServerHistory where server_id = server_id_in;
+ delete from rhnServerInfo where server_id = server_id_in;
+ delete from rhnServerInstallInfo where server_id = server_id_in;
+ delete from rhnServerLocation where server_id = server_id_in;
+ delete from rhnServerLock where server_id = server_id_in;
+ delete from rhnServerNeededCache where server_id = server_id_in;
+ delete from rhnServerNetwork where server_id = server_id_in;
+ delete from rhnServerNotes where server_id = server_id_in;
+ -- I'm not removing the foreign key from rhnServerPackage; that'll
+ -- take forever. Do the delete anyway.
+ delete from rhnServerPackage where server_id = server_id_in;
+ delete from rhnServerTokenRegs where server_id = server_id_in;
+ delete from rhnSnapshotTag where server_id = server_id_in;
+ -- this cascades to:
+ -- rhnSnapshotChannel, rhnSnapshotConfigChannel, rhnSnapshotPackage,
+ -- rhnSnapshotConfigRevision, rhnSnapshotServerGroup,
+ -- rhnSnapshotTag.
+ -- We may want to consider delete_snapshot() at some point, but
+ -- I don't think we need to yet.
+ delete from rhnSnapshot where server_id = server_id_in;
+ delete from rhnUserServerPrefs where server_id = server_id_in;
+ -- hrm, this one's interesting... we _probably_ should delete
+ -- everything for the parent server_id when we delete the proxy,
+ -- but we don't currently.
+ delete from rhnServerPath where server_id_in in (server_id, proxy_server_id);
+ delete from rhnUserServerPerms where server_id = server_id_in;
+
+ delete from rhnServerNetInterface where server_id = server_id_in;
+ delete from rhn_server_monitoring_info where recid = server_id_in;
+
+ delete from rhnAppInstallSession where server_id = server_id_in;
+ delete from rhnServerUuid where server_id = server_id_in;
+
+ -- We delete all the probes running directly against this system
+ -- and any probes that were using this Server as a Proxy Scout.
+ DELETE FROM rhn_probe_state PS WHERE PS.probe_id IN (
+ SELECT CP.probe_id
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in)
+ );
+
+ DELETE FROM rhn_probe P WHERE P.recid IN (
+ SELECT CP.probe_id
+ FROM rhn_check_probe CP
+ WHERE CP.host_id = server_id_in
+ OR CP.sat_cluster_id in
+ (SELECT SN.sat_cluster_id
+ FROM rhn_sat_node SN
+ WHERE SN.server_id = server_id_in)
+ );
+
+ -- delete from time_series TODO
+
+ delete from rhn_check_probe where host_id = server_id_in;
+ delete from rhn_host_probe where host_id = server_id_in;
+
+ delete from rhn_sat_cluster where recid in
+ ( select sat_cluster_id from rhn_sat_node where server_id = server_id_in );
+
+ delete from rhn_sat_node where server_id = server_id_in;
+
+ delete from rhnPushClient where server_id = server_id_in;
+
+ -- now get rhnServer itself.
+ delete
+ from rhnServer
+ where id = server_id_in;
+
+ delete
+ from rhnSet
+ where 1=1
+ and user_id in (
+ select wc.id
+ from rhnServer rs,
+ web_contact wc
+ where rs.id = server_id_in
+ and rs.org_id = wc.org_id
+ )
+ and label = 'system_list'
+ and element = server_id_in;
+end;
+$$
+language plpgsql;
+
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.27-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.27-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-20 14:10 +0000
Tagging package [spacewalk-backend] version [1.5.27-1] in directory [backend/].
Changes since spacewalk-utils-1.5.3-1:
Jan Pazdziora (2):
Removing %{pythonrhnroot}/common/UserDictCase.py* from %files, to match its removal from sources.
Automatic commit of package [spacewalk-backend] release [1.5.27-1].
---
backend/spacewalk-backend.spec | 6 ++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
---
13 years
2 commits - backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 ++++--
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d0f8a80c996397ae0ed14cf660078ae876ba16a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 16:10:50 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.27-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1930be6..bfd4ebe 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.26
+Version: 1.5.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Jan Pazdziora 1.5.27-1
+- Removing %{pythonrhnroot}/common/UserDictCase.py* from %files.
+
* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.26-1
- package path should contain epoch
- 694735 - incremental exports: honor rhn_date / sync_date for ks files
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b597b6d..30004c1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.26-1 backend/
+1.5.27-1 backend/
commit f6bf969cf2fd4b10e58d03fd610e11f451989dd6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 16:10:22 2011 +0200
Removing %{pythonrhnroot}/common/UserDictCase.py* from %files, to match its removal from sources.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index dc953e2..1930be6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -354,7 +354,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/common/rhnTB.py*
%{pythonrhnroot}/common/rhnRepository.py*
%{pythonrhnroot}/common/rhnTranslate.py*
-%{pythonrhnroot}/common/UserDictCase.py*
%{pythonrhnroot}/common/RPC_Base.py*
%attr(770,root,apache) %dir %{_var}/log/rhn
# config files
13 years
Changes to 'refs/tags/spacewalk-utils-1.5.3-1'
by Michael Mraka
Tag 'spacewalk-utils-1.5.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 13:30 +0000
Tagging package [spacewalk-utils] version [1.5.3-1] in directory [utils/].
Changes since spacewalk-backend-1.5.26-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-utils] release [1.5.3-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c1a406e4b3ed251b59ba54d822a9035fc2072faf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 15:30:16 2011 +0200
Automatic commit of package [spacewalk-utils] release [1.5.3-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index eecf8b1..efa52bd 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.5.2-1 utils/
+1.5.3-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 7678121..40c3f42 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.3-1
+- fix broken (non-utf8) changelog entries
+
* Fri Apr 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.2-1
- fixed base channel for spacewalk on F14
- added spacewalk nightly entries
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.26-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 13:30 +0000
Tagging package [spacewalk-backend] version [1.5.26-1] in directory [backend/].
Changes since spacewalk-java-1.5.33-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.5.26-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4c916f0bb1c72ed353374b46f9ec62ff3a11620f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 15:29:59 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.26-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ed70bd8..dc953e2 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.25
+Version: 1.5.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.26-1
+- package path should contain epoch
+- 694735 - incremental exports: honor rhn_date / sync_date for ks files
+
* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.25-1
- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 9938210..b597b6d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.25-1 backend/
+1.5.26-1 backend/
13 years
Changes to 'refs/tags/spacewalk-java-1.5.33-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.33-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-20 13:27 +0000
Tagging package [spacewalk-java] version [1.5.33-1] in directory [java/].
Changes since spacewalk-certs-tools-1.5.2-1:
Jan Pazdziora (2):
706399 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the errataqueue_find_autoupdate_servers context.
Automatic commit of package [spacewalk-java] release [1.5.33-1].
Michael Mraka (2):
fix broken (non-utf8) changelog entries
package path should contain epoch
Milan Zazrivec (1):
694735 - incremental exports: honor rhn_date / sync_date for ks files
---
backend/satellite_tools/disk_dumper/iss.py | 14 +-
backend/server/rhnPackageUpload.py | 2
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
utils/spacewalk-dump-schema | 1
6 files changed, 67 insertions(+), 8 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e65abc8acd9e5f80e02d9ff9767704e55d2434e3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 15:27:35 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d40944f..79b2163 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.5.32
+Version: 1.5.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 20 2011 Jan Pazdziora 1.5.33-1
+- 706399 - replacing rhnServerNeededView with custom subselect
+
* Thu May 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.32-1
- 659138 - fix Custom Quartz format error handling (tlestach(a)redhat.com)
- 659138 - fix repeat-task-picker input tag (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 31026b6..eb22bf3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.32-1 java/
+1.5.33-1 java/
13 years
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 51 +++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
New commits:
commit b23243af080795e44268cb2a67e1442d1e970966
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 20 14:46:23 2011 +0200
706399 - replacing rhnServerNeededView with custom subselect which is generally equivalent, in the errataqueue_find_autoupdate_servers context.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index fb03411..caf9ddf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -140,7 +140,56 @@ SELECT DISTINCT
SELECT DISTINCT
S.id AS server_id, S.org_id org_id
FROM rhnServer S
- JOIN rhnServerNeededView SNV
+ JOIN (
+--
+select rhnChannelErrata.errata_id, rhnChannelErrata.channel_id, rhnServerChannel.server_id, rhnErrataPackage.package_id
+from rhnChannelErrata, rhnErrataPackage, rhnChannelNewestPackage, rhnPackageEVR,
+ rhnServerChannel, rhnServerPackage, rhnPackageUpgradeArchCompat
+where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
+--
+ and rhnChannelErrata.channel_id = rhnChannelNewestPackage.channel_id
+ and rhnErrataPackage.package_id = rhnChannelNewestPackage.package_id
+--
+ and rhnChannelErrata.channel_id = rhnServerChannel.channel_id
+ and rhnChannelNewestPackage.name_id = rhnServerPackage.name_id
+ and rhnServerChannel.server_id = rhnServerPackage.server_id
+--
+ and rhnChannelNewestPackage.evr_id = rhnPackageEVR.id
+--
+ and rhnServerPackage.package_arch_id = rhnPackageUpgradeArchCompat.package_arch_id
+ and rhnPackageUpgradeArchCompat.package_upgrade_arch_id = rhnChannelNewestPackage.package_arch_id
+--
+ and not exists (
+ -- rule out records where channels with lower id exist == get min
+ select 1 from rhnChannelPackage cp, rhnServerChannel csc
+ where cp.channel_id = csc.channel_id
+ and rhnChannelNewestPackage.package_id = cp.package_id
+ and rhnServerChannel.server_id = csc.server_id
+ and cp.channel_id < rhnChannelNewestPackage.channel_id
+ )
+ and not exists (
+ -- rule out records where the server has the same package name with higher evr
+ select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerPackage.server_id = sp.server_id
+ and rhnServerPackage.name_id = sp.name_id
+ and sp.evr_id = sevr.id
+ and rhnPackageEVR.evr <= sevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = sp.package_arch_id
+ )
+ and not exists (
+ -- rule out records where other channel provides the same package name with higher evr
+ select 1 from rhnServerChannel csc, rhnChannelNewestPackage ocnp, rhnPackageEVR oevr, rhnPackageUpgradeArchCompat puac
+ where rhnServerChannel.server_id = csc.server_id
+ and csc.channel_id = ocnp.channel_id
+ and rhnServerPackage.name_id = ocnp.name_id
+ and ocnp.evr_id = oevr.id
+ and rhnPackageEVR.evr < oevr.evr
+ and rhnServerPackage.package_arch_id = puac.package_arch_id
+ and puac.package_upgrade_arch_id = ocnp.package_arch_id
+ )
+--
+ ) SNV
on SNV.server_id = S.id
WHERE SNV.channel_id = :channel_id
AND SNV.errata_id = :errata_id
13 years
2 commits - backend/server utils/spacewalk-dump-schema
by Michael Mraka
backend/server/rhnPackageUpload.py | 2 +-
utils/spacewalk-dump-schema | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7f247c343e23d4c92e5fc56b419233ed96ae1f59
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 14:24:55 2011 +0200
package path should contain epoch
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index c099b1d..fb93e89 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -115,7 +115,7 @@ def relative_path_from_nevra(nevra, org_id, package_type=None, checksum_type=Non
is_source = 0
log_debug(4, nevra, is_source)
return get_package_path(nevra, org_id=org_id, source=is_source,
- prepend=CFG.PREPENDED_DIR, omit_epoch=1, package_type=package_type,
+ prepend=CFG.PREPENDED_DIR, omit_epoch=None, package_type=package_type,
checksum_type=checksum_type, checksum=checksum)
# bug #161989 - get the relative path from the nevra, but omit the package name
commit 46d8c0184b031c2a0b209603549b46dd27b09443
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 11:51:32 2011 +0200
fix broken (non-utf8) changelog entries
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index 6877635..e391111 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -119,6 +119,7 @@ sub process_table {
$row->[$i] =~ s!(.)! sprintf "\\\\%03o", ord($1) !seg;
} else {
$row->[$i] =~ s!([\x00-\x1f\x5c])! sprintf "\\x%02x", ord($1) !seg;
+ utf8::encode($row->[$i]); utf8::decode($row->[$i]);
}
print $row->[$i];
} else {
13 years
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/disk_dumper/iss.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit c3cd0b7b7dee7275352ea8b148fd3843bd20106b
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 20 11:49:48 2011 +0200
694735 - incremental exports: honor rhn_date / sync_date for ks files
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 0fc5b86..a2634de 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -446,10 +446,16 @@ class Dumper(dumper.XML_Dumper):
and rktf.checksum_id = c.id
"""
if self.start_date:
- query += """
- and rkt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
- and rkt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
- """
+ if self.use_rhn_date:
+ query += """
+ and rkt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rkt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
+ else:
+ query += """
+ and rkt.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rkt.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
+ """
self.kickstart_files_query = rhnSQL.Statement(query)
kickstart_files = rhnSQL.prepare(self.kickstart_files_query)
self.kickstart_files = []
13 years
Changes to 'refs/tags/spacewalk-certs-tools-1.5.2-1'
by Michael Mraka
Tag 'spacewalk-certs-tools-1.5.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 08:59 +0000
Tagging package [spacewalk-certs-tools] version [1.5.2-1] in directory [spacewalk/certs-tools/].
Changes since rhnlib-2.5.41-1:
Michael Mraka (3):
704979 - use https:// for fetching org ca cert
704979 - reindented block
Automatic commit of package [spacewalk-certs-tools] release [1.5.2-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 -
spacewalk/certs-tools/rhn_bootstrap_strings.py | 34 ++++++++++-------------
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++-
3 files changed, 21 insertions(+), 20 deletions(-)
---
13 years
rel-eng/packages spacewalk/certs-tools
by Michael Mraka
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 015158cf91c34975d8b9a948329b00ba606e7260
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:59:06 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.5.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 78e4ab2..3027dce 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.5.1-1 spacewalk/certs-tools/
+1.5.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 991eab0..3fe6db2 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.1
+Version: 1.5.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.2-1
+- 704979 - use https:// for fetching org ca cert
+
* Fri Apr 15 2011 Jan Pazdziora 1.5.1-1
- support zypper in bootstrap script and allow multiple GPG keys (mc(a)suse.de)
13 years
2 commits - spacewalk/certs-tools
by Michael Mraka
spacewalk/certs-tools/rhn_bootstrap_strings.py | 34 +++++++++++--------------
1 file changed, 16 insertions(+), 18 deletions(-)
New commits:
commit 6150c3c921ee53759340a080fe187145954aa33c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:56:53 2011 +0200
704979 - reindented block
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index af2faa4..ad48ada 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -257,25 +257,25 @@ def getCorpCACertSh():
return """\
echo
echo "* attempting to install corporate public CA cert"
- if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
- else
- rm -f ${ORG_CA_CERT}
- $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
- mv ${ORG_CA_CERT} /usr/share/rhn/
+if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
+ rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+else
+ rm -f ${ORG_CA_CERT}
+ $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
+ mv ${ORG_CA_CERT} /usr/share/rhn/
+fi
+if [ "$INSTALLER" == zypper ] ; then
+ if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
+ # get name from config
+ ORG_CA_CERT=$(basename $(sed -n 's/^sslCACert *= *//p' /etc/sysconfig/rhn/up2date))
fi
- if [ "$INSTALLER" == zypper ] ; then
- if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- # get name from config
- ORG_CA_CERT=$(basename $(sed -n 's/^sslCACert *= *//p' /etc/sysconfig/rhn/up2date))
- fi
- test -e "/etc/ssl/certs/${ORG_CA_CERT}.pem" || {
- test -d "/etc/ssl/certs" || mkdir -p "/etc/ssl/certs"
- ln -s "/usr/share/rhn/${ORG_CA_CERT}" "/etc/ssl/certs/${ORG_CA_CERT}.pem"
- }
- test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
- fi
+ test -e "/etc/ssl/certs/${ORG_CA_CERT}.pem" || {
+ test -d "/etc/ssl/certs" || mkdir -p "/etc/ssl/certs"
+ ln -s "/usr/share/rhn/${ORG_CA_CERT}" "/etc/ssl/certs/${ORG_CA_CERT}.pem"
+ }
+ test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
+fi
"""
commit 3cd5bbba9aacf5ec78b9cdcabf6cee992367c3ac
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 10:54:45 2011 +0200
704979 - use https:// for fetching org ca cert
USING_SSL test is redundant because HTTPS_PUB_DIRECTORY already contains
correct protocol (http:// or https://)
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index 25f71a1..af2faa4 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -257,12 +257,11 @@ def getCorpCACertSh():
return """\
echo
echo "* attempting to install corporate public CA cert"
-if [ $USING_SSL -eq 1 ] ; then
if [ $ORG_CA_CERT_IS_RPM_YN -eq 1 ] ; then
- rpm -Uvh --force --replacefiles --replacepkgs ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
+ rpm -Uvh --force --replacefiles --replacepkgs ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
else
rm -f ${ORG_CA_CERT}
- $FETCH ${HTTP_PUB_DIRECTORY}/${ORG_CA_CERT}
+ $FETCH ${HTTPS_PUB_DIRECTORY}/${ORG_CA_CERT}
mv ${ORG_CA_CERT} /usr/share/rhn/
fi
@@ -277,7 +276,6 @@ if [ $USING_SSL -eq 1 ] ; then
}
test -x /usr/bin/c_rehash && /usr/bin/c_rehash /etc/ssl/certs/ | grep "${ORG_CA_CERT}"
fi
-fi
"""
13 years
Changes to 'refs/tags/rhnlib-2.5.41-1'
by Michael Mraka
Tag 'rhnlib-2.5.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:30 +0000
Tagging package [rhnlib] version [2.5.41-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-proxy-1.5.7-1:
Michael Mraka (1):
Automatic commit of package [rhnlib] release [2.5.41-1].
---
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
client/rhel rel-eng/packages
by Michael Mraka
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 72cd6e5a7bac0e7c5cf62f3af26d5e13d0de59f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:30:51 2011 +0200
Automatic commit of package [rhnlib] release [2.5.41-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index cc6adb3..8813b84 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.40
+Version: 2.5.41
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.5.41-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Wed Apr 13 2011 Jan Pazdziora 2.5.40-1
- 683200 - simplify idn_pune_to_unicode and idn_ascii_to_pune
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 59d0e2f..2fda6aa 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.40-1 client/rhel/rhnlib/
+2.5.41-1 client/rhel/rhnlib/
13 years
Changes to 'refs/tags/spacewalk-proxy-1.5.7-1'
by Michael Mraka
Tag 'spacewalk-proxy-1.5.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:29 +0000
Tagging package [spacewalk-proxy] version [1.5.7-1] in directory [proxy/proxy/].
Changes since spacewalk-backend-1.5.25-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy] release [1.5.7-1].
---
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
proxy/proxy rel-eng/packages
by Michael Mraka
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 36d013047e05e80c3421471c039a72c5cca695be
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:29:10 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 6ad72a2..ef0fd08 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,9 @@ fi
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.7-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Fri May 13 2011 Miroslav Suchý 1.5.6-1
- 695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and
not just the part beyond / (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 31c4612..d23dc66 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.6-1 proxy/proxy/
+1.5.7-1 proxy/proxy/
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.25-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-20 07:21 +0000
Tagging package [spacewalk-backend] version [1.5.25-1] in directory [backend/].
Changes since spacewalk-java-1.5.32-1:
Michael Mraka (2):
merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
Automatic commit of package [spacewalk-backend] release [1.5.25-1].
---
backend/common/Makefile | 1
backend/common/UserDictCase.py | 79 -----------------
backend/common/rhnApache.py | 2
backend/common/rhnConfig.py | 2
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/basePackageUpload.py | 2
backend/server/handlers/xmlrpc/proxy.py | 2
backend/server/rhnSQL/driver_cx_Oracle.py | 2
backend/server/rhnSQL/driver_postgresql.py | 2
backend/server/rhnSQL/sql_row.py | 2
backend/server/rhnSQL/sql_table.py | 2
backend/server/rhnServer/server_hardware.py | 2
backend/server/rhnServer/server_wrapper.py | 2
backend/server/rhnUser.py | 2
backend/server/test/TestServer.py | 2
backend/spacewalk-backend.spec | 5 -
client/rhel/rhnlib/rhn/UserDictCase.py | 19 +++-
proxy/proxy/apacheHandler.py | 3
proxy/proxy/broker/rhnBroker.py | 3
proxy/proxy/rhnShared.py | 3
rel-eng/packages/spacewalk-backend | 2
21 files changed, 40 insertions(+), 102 deletions(-)
---
13 years
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 262b0b03cdb2c972520221b00db14bfe51ae2838
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 20 09:21:44 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 732ac6f..ed70bd8 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.24
+Version: 1.5.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 20 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.25-1
+- merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
+
* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.24-1
- 705002 - made query pg compatible
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index be7e658..9938210 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.24-1 backend/
+1.5.25-1 backend/
13 years
backend/common backend/satellite_exporter backend/server client/rhel proxy/proxy
by Michael Mraka
backend/common/Makefile | 1
backend/common/UserDictCase.py | 79 -----------------
backend/common/rhnApache.py | 2
backend/common/rhnConfig.py | 2
backend/satellite_exporter/handlers/non_auth_dumper.py | 3
backend/server/basePackageUpload.py | 2
backend/server/handlers/xmlrpc/proxy.py | 2
backend/server/rhnSQL/driver_cx_Oracle.py | 2
backend/server/rhnSQL/driver_postgresql.py | 2
backend/server/rhnSQL/sql_row.py | 2
backend/server/rhnSQL/sql_table.py | 2
backend/server/rhnServer/server_hardware.py | 2
backend/server/rhnServer/server_wrapper.py | 2
backend/server/rhnUser.py | 2
backend/server/test/TestServer.py | 2
client/rhel/rhnlib/rhn/UserDictCase.py | 19 +++-
proxy/proxy/apacheHandler.py | 3
proxy/proxy/broker/rhnBroker.py | 3
proxy/proxy/rhnShared.py | 3
19 files changed, 35 insertions(+), 100 deletions(-)
New commits:
commit dcbda8b96d18de24cf4d6ad1f5d294787cc541c3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 14:44:29 2011 +0200
merged backend/common/UserDictCase.py into rhnlib/rhn/UserDictCase.py
diff --git a/backend/common/Makefile b/backend/common/Makefile
index ab01f14..c0245be 100644
--- a/backend/common/Makefile
+++ b/backend/common/Makefile
@@ -23,7 +23,6 @@ SPACEWALK_FILES = __init__ \
rhnTB \
rhnTranslate \
RPC_Base \
- UserDictCase \
checksum \
fileutils \
rhn_deb \
diff --git a/backend/common/UserDictCase.py b/backend/common/UserDictCase.py
deleted file mode 100644
index 2a97492..0000000
--- a/backend/common/UserDictCase.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2008--2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-#
-
-from types import StringType
-from UserDict import UserDict
-
-# A dictionary with case insensitive keys
-class UserDictCase(UserDict):
- def __init__(self, data = None):
- self.kcase = {}
- UserDict.__init__(self, data)
- # some methods used to make the class work as a dictionary
- def __setitem__(self, key, value):
- lkey = key
- if isinstance(key, StringType):
- lkey = key.lower()
- self.data[lkey] = value
- self.kcase[lkey] = key
- def __getitem__(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- if not self.data.has_key(key):
- return None
- return self.data[key]
- def __delitem__(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- del self.data[key]
- del self.kcase[key]
- get = __getitem__
- def keys(self):
- return self.kcase.values()
- def items(self):
- return self.get_hash().items()
- def has_key(self, key):
- if isinstance(key, StringType):
- key = key.lower()
- return self.data.has_key(key)
- def clear(self):
- self.data.clear()
- self.kcase.clear()
- # return this data as a real hash
- def get_hash(self):
- return reduce(lambda a, (ik, v), hc=self.kcase:
- a.update({ hc[ik] : v}) or a, self.data.items(), {})
-
- # return the data for marshalling
- def __getstate__(self):
- return self.get_hash()
- # we need a setstate because of the __getstate__ presence screws up deepcopy
- def __setstate__(self, state):
- self.__init__(state)
- # get a dictionary out of this instance ({}.update doesn't get instances)
- def dict(self):
- return self.get_hash()
- def update(self, updict):
- for (k, v) in updict.items():
- lk = k
- if isinstance(k, StringType):
- lk = k.lower()
- self.data[lk] = v
- self.kcase[lk] = k
- # Expose an iterator. This would normally fail if there is no iter()
- # function defined - but __iter__ will never be called on python 1.5.2
- def __iter__(self):
- return iter(self.data)
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py
index ec23ad2..e0f23e8 100644
--- a/backend/common/rhnApache.py
+++ b/backend/common/rhnApache.py
@@ -26,7 +26,7 @@ from spacewalk.common import apache
# Now local module imports
import rhnFlags
-from UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
from rhnLog import log_debug
from rhnLog import log_error
from rhnTranslate import cat
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index 6c6b786..d532290 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -18,7 +18,7 @@ import sys
import glob
import stat
-from UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
_CONFIG_ROOT = '/etc/rhn'
diff --git a/backend/satellite_exporter/handlers/non_auth_dumper.py b/backend/satellite_exporter/handlers/non_auth_dumper.py
index 255b717..9f53cbf 100644
--- a/backend/satellite_exporter/handlers/non_auth_dumper.py
+++ b/backend/satellite_exporter/handlers/non_auth_dumper.py
@@ -19,6 +19,8 @@ Non-authenticated dumper
import os
import xmlrpclib
import gzip
+
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.server import rhnSQL, rhnLib
@@ -27,7 +29,6 @@ from spacewalk.server.importlib.backendLib import localtime
from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
from spacewalk.satellite_tools.exporter import exportLib
from spacewalk.satellite_tools.disk_dumper import dumper
diff --git a/backend/server/basePackageUpload.py b/backend/server/basePackageUpload.py
index b77ce1b..02f1623 100644
--- a/backend/server/basePackageUpload.py
+++ b/backend/server/basePackageUpload.py
@@ -14,11 +14,11 @@
#
# $Id$
+from rhn.UserDictCase import UserDictCase
from spacewalk.common import apache
from spacewalk.common.rhnLog import log_debug
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common.UserDictCase import UserDictCase
class BasePackageUpload:
diff --git a/backend/server/handlers/xmlrpc/proxy.py b/backend/server/handlers/xmlrpc/proxy.py
index 70d2056..6fddce0 100644
--- a/backend/server/handlers/xmlrpc/proxy.py
+++ b/backend/server/handlers/xmlrpc/proxy.py
@@ -17,12 +17,12 @@
import time
# common module imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common import rhnFlags
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
# local module imports
from spacewalk.server.rhnLib import computeSignature
diff --git a/backend/server/rhnSQL/driver_cx_Oracle.py b/backend/server/rhnSQL/driver_cx_Oracle.py
index f7a2401..cf8b929 100644
--- a/backend/server/rhnSQL/driver_cx_Oracle.py
+++ b/backend/server/rhnSQL/driver_cx_Oracle.py
@@ -29,11 +29,11 @@ import os
import re
import types
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
from spacewalk.common import rhnConfig
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
from sql_base import adjust_type
from const import ORACLE
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index bb8014f..1dfddea 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -28,12 +28,12 @@ if not hasattr(psycopg2, 'extensions'):
import psycopg2.extensions
import sql_base
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
from spacewalk.server.rhnSQL import sql_types
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
from const import POSTGRESQL
def convert_named_query_params(query):
diff --git a/backend/server/rhnSQL/sql_row.py b/backend/server/rhnSQL/sql_row.py
index d34ce67..0b9a9bb 100644
--- a/backend/server/rhnSQL/sql_row.py
+++ b/backend/server/rhnSQL/sql_row.py
@@ -17,8 +17,8 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
import sql_base
import sql_lib
diff --git a/backend/server/rhnSQL/sql_table.py b/backend/server/rhnSQL/sql_table.py
index 1aa2a75..8171b1a 100644
--- a/backend/server/rhnSQL/sql_table.py
+++ b/backend/server/rhnSQL/sql_table.py
@@ -18,8 +18,8 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnException import rhnException
-from spacewalk.common.UserDictCase import UserDictCase
import sql_base
import sql_lib
diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py
index d6d38e3..4f69558 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -19,9 +19,9 @@
import string
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common.UserDictCase import UserDictCase
from spacewalk.common.rhnTB import Traceback
from spacewalk.server import rhnSQL
diff --git a/backend/server/rhnServer/server_wrapper.py b/backend/server/rhnServer/server_wrapper.py
index 758a6b6..11c4d52 100644
--- a/backend/server/rhnServer/server_wrapper.py
+++ b/backend/server/rhnServer/server_wrapper.py
@@ -24,7 +24,7 @@ from server_packages import Packages
from server_history import History
from server_solarispatches import SolarisPatches
-from spacewalk.common.UserDictCase import UserDictCase
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL
class ServerWrapper(Packages, Hardware, History, SolarisPatches):
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 5fab8bc..1399a2e 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -21,11 +21,11 @@ import crypt
import string
# Global Modules
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault, rhnException
from spacewalk.common.rhnTranslate import _
-from spacewalk.common.UserDictCase import UserDictCase
import rhnSQL
import rhnSession
diff --git a/backend/server/test/TestServer.py b/backend/server/test/TestServer.py
index 26cb6a8..7c253e5 100644
--- a/backend/server/test/TestServer.py
+++ b/backend/server/test/TestServer.py
@@ -15,9 +15,9 @@
#
import time
+from rhn.UserDictCase import UserDictCase
from spacewalk.server import rhnSQL, rhnServer, rhnAction
from spacewalk.common import rhnConfig, rhnFlags
-from spacewalk.common.UserDictCase import UserDictCase
import server.xmlrpc.up2date
from misc_functions import create_activation_key
import misc_functions
diff --git a/client/rhel/rhnlib/rhn/UserDictCase.py b/client/rhel/rhnlib/rhn/UserDictCase.py
index f5d5302..e6c217b 100644
--- a/client/rhel/rhnlib/rhn/UserDictCase.py
+++ b/client/rhel/rhnlib/rhn/UserDictCase.py
@@ -1,10 +1,21 @@
+#
+# Copyright (c) 2001--2011 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+#
# This file implements a case insensitive dictionary on top of the
# UserDict standard python class
#
-# Copyright (c) 2001-2005, Red Hat Inc.
-# All rights reserved.
-#
-# $Id$
from types import StringType
from UserDict import UserDict
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 8881c90..39b617b 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -26,12 +26,13 @@ from rhnConstants import *
from rhn import rpclib, connections
## common imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnLog import initLOG, log_debug, log_error
from spacewalk.common.rhnApache import rhnApache
from spacewalk.common.rhnTB import Traceback
from spacewalk.common.rhnException import rhnFault, rhnException
-from spacewalk.common import rhnFlags, UserDictCase, apache
+from spacewalk.common import rhnFlags, apache
from spacewalk.common.rhnLib import setHeaderValue
## local imports
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index b96bf46..cc83804 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -23,11 +23,12 @@ import re
from urlparse import urlsplit, urlparse, urlunparse
# common module imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnLib import parseUrl
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnLog import log_debug, log_error
from spacewalk.common.rhnException import rhnFault
-from spacewalk.common import UserDictCase, rhnFlags, apache
+from spacewalk.common import rhnFlags, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 84131ef..172a812 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -26,11 +26,12 @@ from rhn import connections
from rhn.SSL import TimeoutException
## common imports
+from rhn.UserDictCase import UserDictCase
from spacewalk.common.rhnTB import Traceback
from spacewalk.common.rhnConfig import CFG
from spacewalk.common.rhnException import rhnFault, rhnException
from spacewalk.common.rhnLog import log_debug, log_error
-from spacewalk.common import UserDictCase, rhnFlags, rhnLib, apache
+from spacewalk.common import rhnFlags, rhnLib, apache
from spacewalk.common.rhnTranslate import _
## local imports
13 years
Changes to 'refs/tags/spacewalk-java-1.5.32-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.32-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-19 16:30 +0000
Tagging package [spacewalk-java] version [1.5.32-1] in directory [java/].
Changes since rhn-virtualization-5.4.23-1:
Tomas Lestach (2):
659138 - fix Custom Quartz format error handling
Automatic commit of package [spacewalk-java] release [1.5.32-1].
---
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 13 +++++++---
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 16 insertions(+), 5 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 14da52e85e54e717fbf7065c989199154e554ec3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 18:30:07 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c45a565..d40944f 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.5.31
+Version: 1.5.32
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.32-1
+- 659138 - fix Custom Quartz format error handling (tlestach(a)redhat.com)
+- 659138 - fix repeat-task-picker input tag (tlestach(a)redhat.com)
+
* Wed May 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.31-1
- 659138 - fix message on the schedule create page (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 69391f7..31026b6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.31-1 java/
+1.5.32-1 java/
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 13 +++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 74c41853fae70b9e3f81c1cd6a5b3bd6a5e8a177
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 18:28:03 2011 +0200
659138 - fix Custom Quartz format error handling
fixing issues, when Custome Quartz format is submitted empty or in wrong format
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
index 436e2b4..db7c810 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.TaskomaticApiException;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -87,7 +88,7 @@ public class ScheduleDetailAction extends RhnAction {
RecurringEventPicker picker = RecurringEventPicker.prepopulatePicker(
request, "date", null);
- if (picker.isDisabled()) {
+ if (picker.isDisabled() || StringUtils.isEmpty(picker.getCronEntry())) {
if (scheduleId == null) {
prepDropdowns(ctx);
createErrorMessage(request, "message.scheduledisabled", null);
@@ -122,8 +123,14 @@ public class ScheduleDetailAction extends RhnAction {
mapping.findForward("success"), params);
}
catch (TaskomaticApiException e) {
- createErrorMessage(request,
- "repos.jsp.message.taskomaticdown", null);
+ if (e.getMessage().contains("InvalidParamException")) {
+ createErrorMessage(request,
+ "repos.jsp.message.invalidcron", picker.getCronEntry());
+ }
+ else {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
return getStrutsDelegate().forwardParams(
mapping.findForward("default"), params);
}
13 years
Changes to 'refs/tags/rhn-virtualization-5.4.23-1'
by Miroslav Suchý
Tag 'rhn-virtualization-5.4.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-19 15:52 +0000
Tagging package [rhn-virtualization] version [5.4.23-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-web-1.5.12-1:
Miroslav Suchý (4):
rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-virtualization-host rhn-virtualization
rhn-virtualization-host.noarch: E: non-executable-script /usr/share/rhn/virtualization/localvdsm.py 0644L /usr/bin/python
simplify spec
Automatic commit of package [rhn-virtualization] release [5.4.23-1].
Tomas Lestach (1):
659138 - fix repeat-task-picker input tag
---
client/tools/rhn-virtualization/rhn-virtualization.spec | 84 +++-------
client/tools/rhn-virtualization/scripts/rhn-virtualization-host | 4
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 5
rel-eng/packages/rhn-virtualization | 2
4 files changed, 31 insertions(+), 64 deletions(-)
---
13 years
4 commits - client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhn-virtualization/rhn-virtualization.spec | 84 +++-------
client/tools/rhn-virtualization/scripts/rhn-virtualization-host | 4
rel-eng/packages/rhn-virtualization | 2
3 files changed, 29 insertions(+), 61 deletions(-)
New commits:
commit 7da7a32968f5f08de4a4e610b8a550d07cc7639d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:52:37 2011 +0200
Automatic commit of package [rhn-virtualization] release [5.4.23-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 49a35e0..6372ad6 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.22
+Version: 5.4.23
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -134,6 +134,12 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu May 19 2011 Miroslav Suchý 5.4.23-1
+- simplify spec
+- rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-
+ virtualization-host rhn-virtualization
+- fix spelling error
+
* Fri Apr 15 2011 Jan Pazdziora 5.4.22-1
- build rhn-virtualization on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index e46a96b..061cfe2 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.22-1 client/tools/rhn-virtualization/
+5.4.23-1 client/tools/rhn-virtualization/
commit c6f3e3c74edbf7955e55b4e18d33aed6fa39ba1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:51:20 2011 +0200
simplify spec
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index b2d2575..49a35e0 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -104,24 +104,12 @@ rm -rf $RPM_BUILD_ROOT
%files common
%defattr(-,root,root,-)
%dir %{rhn_dir}/virtualization
-%{rhn_dir}/virtualization/__init__.py
-%{rhn_dir}/virtualization/__init__.pyc
-%{rhn_dir}/virtualization/__init__.pyo
-%{rhn_dir}/virtualization/batching_log_notifier.py
-%{rhn_dir}/virtualization/batching_log_notifier.pyc
-%{rhn_dir}/virtualization/batching_log_notifier.pyo
-%{rhn_dir}/virtualization/constants.py
-%{rhn_dir}/virtualization/constants.pyc
-%{rhn_dir}/virtualization/constants.pyo
-%{rhn_dir}/virtualization/errors.py
-%{rhn_dir}/virtualization/errors.pyc
-%{rhn_dir}/virtualization/errors.pyo
-%{rhn_dir}/virtualization/notification.py
-%{rhn_dir}/virtualization/notification.pyc
-%{rhn_dir}/virtualization/notification.pyo
-%{rhn_dir}/virtualization/util.py
-%{rhn_dir}/virtualization/util.pyc
-%{rhn_dir}/virtualization/util.pyo
+%{rhn_dir}/virtualization/__init__.py*
+%{rhn_dir}/virtualization/batching_log_notifier.py*
+%{rhn_dir}/virtualization/constants.py*
+%{rhn_dir}/virtualization/errors.py*
+%{rhn_dir}/virtualization/notification.py*
+%{rhn_dir}/virtualization/util.py*
%doc LICENSE
%files host
@@ -130,45 +118,19 @@ rm -rf $RPM_BUILD_ROOT
%dir %{rhn_conf_dir}/virt/auto
%{_initrddir}/rhn-virtualization-host
%config(noreplace) %attr(644,root,root) %{cron_dir}/rhn-virtualization.cron
-%{rhn_dir}/virtualization/domain_config.py
-%{rhn_dir}/virtualization/domain_config.pyc
-%{rhn_dir}/virtualization/domain_control.py
-%{rhn_dir}/virtualization/domain_control.pyc
-%{rhn_dir}/virtualization/domain_directory.py
-%{rhn_dir}/virtualization/domain_directory.pyc
-%{rhn_dir}/virtualization/get_config_value.py
-%{rhn_dir}/virtualization/get_config_value.pyc
-%{rhn_dir}/virtualization/init_action.py
-%{rhn_dir}/virtualization/init_action.pyc
-%{rhn_dir}/virtualization/poller.py
-%{rhn_dir}/virtualization/poller.pyc
-%{rhn_dir}/virtualization/schedule_poller.py
-%{rhn_dir}/virtualization/schedule_poller.pyc
-%{rhn_dir}/virtualization/poller_state_cache.py
-%{rhn_dir}/virtualization/poller_state_cache.pyc
-%{rhn_dir}/virtualization/start_domain.py
-%{rhn_dir}/virtualization/start_domain.pyc
-%{rhn_dir}/virtualization/state.py
-%{rhn_dir}/virtualization/state.pyc
-%{rhn_dir}/virtualization/support.py
-%{rhn_dir}/virtualization/support.pyc
-%{rhn_dir}/actions/virt.py
-%{rhn_dir}/actions/virt.pyc
-%{rhn_dir}/virtualization/domain_config.pyo
-%{rhn_dir}/virtualization/domain_control.pyo
-%{rhn_dir}/virtualization/domain_directory.pyo
-%{rhn_dir}/virtualization/get_config_value.pyo
-%{rhn_dir}/virtualization/init_action.pyo
-%{rhn_dir}/virtualization/poller.pyo
-%{rhn_dir}/virtualization/schedule_poller.pyo
-%{rhn_dir}/virtualization/poller_state_cache.pyo
-%{rhn_dir}/virtualization/start_domain.pyo
-%{rhn_dir}/virtualization/state.pyo
-%{rhn_dir}/virtualization/support.pyo
-%{rhn_dir}/virtualization/localvdsm.py
-%{rhn_dir}/virtualization/localvdsm.pyc
-%{rhn_dir}/virtualization/localvdsm.pyo
-%{rhn_dir}/actions/virt.pyo
+%{rhn_dir}/virtualization/domain_config.py*
+%{rhn_dir}/virtualization/domain_control.py*
+%{rhn_dir}/virtualization/domain_directory.py*
+%{rhn_dir}/virtualization/get_config_value.py*
+%{rhn_dir}/virtualization/init_action.py*
+%{rhn_dir}/virtualization/poller.py*
+%{rhn_dir}/virtualization/schedule_poller.py*
+%{rhn_dir}/virtualization/poller_state_cache.py*
+%{rhn_dir}/virtualization/start_domain.py*
+%{rhn_dir}/virtualization/state.py*
+%{rhn_dir}/virtualization/support.py*
+%{rhn_dir}/actions/virt.py*
+%{rhn_dir}/virtualization/localvdsm.py*
%doc LICENSE
%changelog
commit eecb04f8d669e270e307d25d398fb6e98846afa9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:07:22 2011 +0200
rhn-virtualization-host.noarch: E: non-executable-script /usr/share/rhn/virtualization/localvdsm.py 0644L /usr/bin/python
diff --git a/client/tools/rhn-virtualization/virtualization/localvdsm.py b/client/tools/rhn-virtualization/virtualization/localvdsm.py
old mode 100644
new mode 100755
commit c05ebb3ad9a3b6d1e5ba872a492dd25f6a13b6a7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 19 17:04:28 2011 +0200
rhn-virtualization-host.noarch: E: incoherent-subsys /etc/rc.d/init.d/rhn-virtualization-host rhn-virtualization
diff --git a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
index fe5d77c..7353826 100755
--- a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
+++ b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host
@@ -31,7 +31,7 @@ start() {
fi
done
- touch /var/lock/subsys/rhn-virtualization
+ touch /var/lock/subsys/rhn-virtualization-host
echo -n "Starting RHN Managed Xen Domains:"
if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
@@ -51,7 +51,7 @@ stop() {
fi
done
- rm -f /var/lock/subsys/rhn-virtualization
+ rm -f /var/lock/subsys/rhn-virtualization-host
echo -n "Stopping RHN Managed Xen Domains:"
if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
13 years
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 8d54e9ce9d3bc95b85f95d802c6b7e4f102f25a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 19 17:26:03 2011 +0200
659138 - fix repeat-task-picker input tag
when clicking on Custom Quartz format edit, edit area doesn't stay active
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
index 4ac0c85..ce6ed6b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf
@@ -60,8 +60,7 @@
<input type="radio" name="${picker.name}_status" value="cron" id="cron"
<c:if test="${picker.status == 'cron'}">checked="true"</c:if> />
- <label for="cron"><bean:message key="schedule.cron"/>:
- <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}">
+ <label for="cron"><bean:message key="schedule.cron"/>:</label>
+ <input type="text" size="20" name="${picker.name}_cron" value="${picker.cronEntry}" />
- </label>
13 years
Changes to 'refs/tags/spacewalk-web-1.5.12-1'
by Michael Mraka
Tag 'spacewalk-web-1.5.12-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-19 09:15 +0000
Tagging package [spacewalk-web] version [1.5.12-1] in directory [web/].
Changes since spacewalk-backend-1.5.24-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [1.5.12-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 29fb160a17301cfaa7f836247ead15bb561d79c2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 11:15:36 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 0b24adf..8a6bd0d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.11-1 web/
+1.5.12-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5a88888..e63c925 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.11
+Version: 1.5.12
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
+* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.12-1
+- made queries PostgreSQL compatible
+
* Tue May 17 2011 Miroslav Suchý 1.5.11-1
- spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent ->
equivalent, equivalence, univalent (msuchy(a)redhat.com)
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.24-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.24-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-19 09:14 +0000
Tagging package [spacewalk-backend] version [1.5.24-1] in directory [backend/].
Changes since spacewalk-java-1.5.31-1:
Julian Einwag (1):
made queries PostgreSQL compatible
Michael Mraka (2):
705002 - made query pg compatible
Automatic commit of package [spacewalk-backend] release [1.5.24-1].
---
backend/server/rhnAction.py | 2
backend/spacewalk-backend.spec | 5 +
rel-eng/packages/spacewalk-backend | 2
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 48 ++++++++++----
4 files changed, 42 insertions(+), 15 deletions(-)
---
13 years
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 ecde3e8e76c31d529c9781e677e9c69220d74f86
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 19 11:14:51 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.24-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6724395..732ac6f 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.23
+Version: 1.5.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu May 19 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.24-1
+- 705002 - made query pg compatible
+
* Wed May 18 2011 Miroslav Suchý 1.5.23-1
- do not remove /var/satellite/redhat directory, satellite-sync expect it
- add missing function to pg Cursor
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d441cc6..be7e658 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.23-1 backend/
+1.5.24-1 backend/
13 years
web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 48 ++++++++++----
1 file changed, 36 insertions(+), 12 deletions(-)
New commits:
commit 6cc572f6be2a5e861274bce06e266336e0fa8d54
Author: Julian Einwag <je(a)rockenstein.de>
Date: Thu May 19 10:35:53 2011 +0200
made queries PostgreSQL compatible
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index e71117e..59863f3 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -107,6 +107,7 @@ ORDER BY UPPER(PN.name || '-' || PE.version || '-' || PE.release || (CASE WHEN P
<mode name="package_removal_failures">
<query params="sid, action_id">
+select * from (
SELECT PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE,
PC.name || case when PC.version is NULL then ''
else '-' || PC.version end AS NEEDED_CAPABILITY,
@@ -122,12 +123,14 @@ SELECT PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE,
AND APRF.name_id = PN.id
AND APRF.evr_id = PE.id
AND APRF.capability_id = PC.id
-ORDER BY UPPER(PACKAGE)
+) X
+ORDER BY UPPER(X.package)
</query>
</mode>
<mode name="packages_in_errata">
<query params="eid">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -141,13 +144,15 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_tmp_errata">
<query params="eid">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -161,7 +166,8 @@ WHERE EP.errata_id = :eid
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
@@ -730,18 +736,21 @@ ORDER BY UPPER (PN.NAME)
<mode name="packages_in_set">
<query params="set_label, user_id">
+select * from (
SELECT PN.id || '|' || PE.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
FROM rhnPackageName PN, rhnPackageEVR PE, rhnSet S
WHERE S.label = :set_label
AND S.user_id = :user_id
AND S.element = PN.id
AND S.element_two = PE.id
-ORDER BY UPPER(NVRE)
+) X
+ORDER BY UPPER(X.NVRE)
</query>
</mode>
<mode name="package_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA
FROM rhnPackage P,
rhnPackageName PN,
@@ -754,12 +763,14 @@ ORDER BY UPPER(NVRE)
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="patch_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA,
P.summary, SPT.name as ptype
FROM rhnPackage P,
@@ -777,12 +788,14 @@ ORDER BY UPPER(NVREA)
AND PA.id = P.package_arch_id
AND SP.package_id = P.id
AND SP.patch_type = SPT.id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="patchset_ids_in_set">
<query params="set_label, user_id">
+select * from (
SELECT P.id AS ID, PN.name || '-' || evr_t_as_vre_simple(PE.evr) || '.' || PA.label AS NVREA,
P.summary
FROM rhnPackage P,
@@ -798,12 +811,14 @@ ORDER BY UPPER(NVREA)
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
AND SP.package_id = P.id
-ORDER BY UPPER(NVREA)
+) X
+ORDER BY UPPER(X.NVREA)
</query>
</mode>
<mode name="packages_owned_by_org">
<query params="org_id">
+select * from (
SELECT DISTINCT P.id id, PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label package_nvre
@@ -815,7 +830,8 @@ ORDER BY UPPER(NVREA)
AND PN.id = P.name_id
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
@@ -871,6 +887,7 @@ ORDER BY UPPER(PACKAGE_NVRE)
<mode name="packages_available_to_errata_in_channel">
<query params="source_cid, target_eid">
+select * from (
SELECT P.id AS ID,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
P.summary
@@ -884,13 +901,15 @@ SELECT P.id AS ID,
FROM rhnErrataPackage EP
WHERE EP.errata_id = :target_eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+) X
+ORDER BY UPPER(X.PACKAGE_NVRE)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_available_to_tmp_errata_in_channel">
<query params="source_cid, target_eid">
+select * from (
SELECT P.id AS ID,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS PACKAGE_NVRE,
P.summary
@@ -904,7 +923,8 @@ SELECT P.id AS ID,
FROM rhnErrataPackagetmp EP
WHERE EP.errata_id = :target_eid
AND EP.package_id = P.id)
-ORDER BY UPPER(PACKAGE_NVRE)
+) X
+ORDER BY UPPER(X.PACKAGE_NVRE)
</query>
<elaborator name="package_channels" />
</mode>
@@ -925,6 +945,7 @@ SELECT CP.package_id id, C.name package_channels
<mode name="managed_packages_in_channel">
<query params="channel_id, org_id">
+select * from (
SELECT DISTINCT CP.package_id id, PN.name || '-' || PE.version ||
'-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':'
|| PE.epoch END) || '-' || PA.label package_nvre
@@ -939,13 +960,15 @@ SELECT CP.package_id id, C.name package_channels
AND PE.id = P.evr_id
AND PA.id = P.package_arch_id
AND P.org_id = :org_id
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
<elaborator name="package_channels" />
</mode>
<mode name="packages_in_no_channels_owned_by_org">
<query params="org_id">
+select * from (
SELECT DISTINCT P.id, PN.name || '-' || PE.version || '-' ||
PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' ||
PE.epoch END) || '-' || PA.label package_nvre
@@ -960,7 +983,8 @@ ORDER BY UPPER(package_nvre)
AND NOT EXISTS (SELECT 1
FROM rhnChannelPackage CP
WHERE P.id = CP.package_id)
-ORDER BY UPPER(package_nvre)
+) X
+ORDER BY UPPER(X.package_nvre)
</query>
</mode>
13 years
backend/server
by Michael Mraka
backend/server/rhnAction.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7d3571ed25b8c9e4b6855e7776ebd72c3faff005
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 18 22:39:40 2011 +0200
705002 - made query pg compatible
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 62d40f6..7c6cc89 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -40,7 +40,7 @@ def schedule_action(action_type, action_name=None, delta_time=0,
insert into rhnAction
(id, org_id, action_type, name, scheduler, earliest_action, prerequisite)
values (:action_id, :org_id, :action_type_id, :action_name, :scheduler,
- sysdate + :delta / 86400, :prerequisite)
+ current_timestamp + numtodsinterval(:delta, 'second'), :prerequisite)
""")
apply(h.execute, (), params)
13 years
Changes to 'refs/tags/spacewalk-java-1.5.31-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.31-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-18 17:21 +0000
Tagging package [spacewalk-java] version [1.5.31-1] in directory [java/].
Changes since spacewalk-backend-1.5.23-1:
Tomas Lestach (2):
659138 - fix message on the schedule create page
Automatic commit of package [spacewalk-java] release [1.5.31-1].
---
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6633d4589eecee8101c10bffecbc1757445a32a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 18 19:21:14 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.31-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 40bf1a7..c45a565 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.5.30
+Version: 1.5.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.31-1
+- 659138 - fix message on the schedule create page (tlestach(a)redhat.com)
+
* Tue May 17 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.30-1
- 643905 - make sure hibernate doesn't use cached kickstart trees, but takes
actual DB state (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7240d27..69391f7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.30-1 java/
+1.5.31-1 java/
13 years
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2d5cc2b287032562b4e1ee7fa03ae4ed3c59428d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 18 18:58:28 2011 +0200
659138 - fix message on the schedule create page
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index bcf226e..dab30b4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -18,10 +18,10 @@
<h2><bean:message key="schedule.edit.jsp.basicscheduledetails"/></h2>
<div class="page-summary">
- <c:if test="${active}">
+ <c:if test="${empty param.schid or active}">
<bean:message key="schedule.edit.jsp.introparagraph"/>
</c:if>
- <c:if test="${not active}">
+ <c:if test="${not empty param.schid and not active}">
<bean:message key="schedule.edit.jsp.notactive"/>
</c:if>
</div>
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.23-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-18 15:42 +0000
Tagging package [spacewalk-backend] version [1.5.23-1] in directory [backend/].
Changes since spacewalk-java-1.5.30-1:
Miroslav Suchý (5):
fix spelling error
217531 - fix package count
add missing function to pg Cursor
do not remove /var/satellite/redhat directory, satellite-sync expect it
Automatic commit of package [spacewalk-backend] release [1.5.23-1].
---
backend/satellite_tools/satsync.py | 15 ++++++++++-----
backend/satellite_tools/spacewalk-data-fsck | 2 +-
backend/server/rhnSQL/driver_postgresql.py | 3 +++
backend/spacewalk-backend.spec | 11 ++++++++++-
client/tools/rhn-virtualization/rhn-virtualization.spec | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
6 files changed, 26 insertions(+), 9 deletions(-)
---
13 years
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/satellite_tools/spacewalk-data-fsck | 2 +-
backend/spacewalk-backend.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 0693f740ed6a2c530412e10da34a2245158c79bc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 17:42:33 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.23-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index cf7a389..6724395 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.22
+Version: 1.5.23
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,15 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 18 2011 Miroslav Suchý 1.5.23-1
+- do not remove /var/satellite/redhat directory, satellite-sync expect it
+- add missing function to pg Cursor
+- 217531 - fix package count
+- Refactoring of make_evr made MakeEvrError unused, removing.
+- Removal of create_channel_families and create_channels made InvalidEntryError
+ unused, removing.
+- 702684 - made MPM_Header compatible with RPM_Header
+
* Mon May 16 2011 Michael Calmer <mc(a)suse.de> 1.5.22-1
- inherit from DependencyItem like other dep classes (mc(a)suse.de)
- test if checksum_type exists before accessing it (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3094a45..d441cc6 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.22-1 backend/
+1.5.23-1 backend/
commit 2a8293d2e88ac2406cea8b7a693b01b8c9fdd080
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 17:39:55 2011 +0200
do not remove /var/satellite/redhat directory, satellite-sync expect it
diff --git a/backend/satellite_tools/spacewalk-data-fsck b/backend/satellite_tools/spacewalk-data-fsck
index a8601aa..032b645 100755
--- a/backend/satellite_tools/spacewalk-data-fsck
+++ b/backend/satellite_tools/spacewalk-data-fsck
@@ -215,7 +215,7 @@ def not_in_db(path, options):
log(0, "Removed file missing in db: %s" % (path))
os.unlink(path)
dirname = os.path.dirname(path)
- while dirname != CFG.MOUNT_POINT:
+ while (dirname != CFG.MOUNT_POINT) and (dirname != CFG.MOUNT_POINT+'/'+CFG.PREPENDED_DIR):
try:
os.rmdir(dirname)
except OSError, e:
13 years
3 commits - backend/satellite_tools backend/server client/tools
by Miroslav Suchý
backend/satellite_tools/satsync.py | 15 ++++++++++-----
backend/server/rhnSQL/driver_postgresql.py | 3 +++
client/tools/rhn-virtualization/rhn-virtualization.spec | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 4641e2989175549f0e009d0ae1d4b7e6f1435f34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 15:49:00 2011 +0200
add missing function to pg Cursor
addressing:
Traceback (most recent call last):
File "/usr/bin/spacewalk-data-fsck", line 267, in ?
exit_value += check_db_vs_disk(options)
File "/usr/bin/spacewalk-data-fsck", line 105, in check_db_vs_disk
h.close()
AttributeError: Cursor instance has no attribute 'close'
In Oracle the h has value:
<__builtin__.OracleCursor on <cx_Oracle.Connection to spacewalk@//localhost:1521/XE>>
I'm not really sure if we should do something here, but this should be
enough for now.
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index 0921468..bb8014f 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -314,3 +314,6 @@ class Cursor(sql_base.Cursor):
c = rhnSQL.prepare(sql)
kwargs[column_name] = data
apply(c.execute, (), kwargs)
+
+ def close(self):
+ pass
commit 3fe8370655e9dfcd8741c1ffa3c9f85df5b5519d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 18 14:17:14 2011 +0200
217531 - fix package count
- do not count package twice
- do not count packages, which already lays on disk
- fix remaining time - you could not multiply timedelta with float, but
we can do timedelta*100*small_number/100
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1f101cd..7786098 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1731,7 +1731,6 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
#count size of missing packages
for package_id, path in missing_fs_packages:
- pkg_current = pkg_current + 1
timestamp = short_package_collection.get_package_timestamp(package_id)
package = package_collection.get_package(package_id, timestamp)
total_size = total_size+package['package_size']
@@ -1739,7 +1738,8 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
log(1, messages.package_fetch_total_size %
(self._bytes_to_fuzzy(total_size)))
- processed_size = 0
+ real_processed_size = processed_size = 0
+ real_total_size = total_size
start_time = round(time.time())
for package_id, path in missing_fs_packages:
@@ -1765,6 +1765,9 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
checksum_type, checksum)
if errcode == 0:
# file is already there
+ # do not count this size to time estimate
+ real_total_size -= package['package_size']
+ processed_size += package['package_size']
continue
rpmManip = RpmManip(package, path)
@@ -1809,10 +1812,12 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# Determine downloaded size and remaining time
size = package['package_size']
- processed_size = processed_size + size
+ real_processed_size += size
+ processed_size += size
current_time = round(time.time())
- remain_time = (datetime.timedelta(seconds=current_time-start_time))*(total_size/processed_size - 1)
-
+ # timedalta could not be multiplicated by float
+ remain_time = (datetime.timedelta(seconds=current_time-start_time))*((real_total_size*100)/real_processed_size-100)/100
+
log(1, messages.package_fetch_remain_size_time %
(self._bytes_to_fuzzy(processed_size), self._bytes_to_fuzzy(total_size), remain_time))
commit 94e937b38ea36e261d619fb44f3f0ef7b09c1aa0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 16:51:41 2011 +0200
fix spelling error
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index 9657469..b2d2575 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -3,7 +3,7 @@
%define cron_dir %{_sysconfdir}/cron.d
Name: rhn-virtualization
-Summary: RHN/Spacewalk action support for virualization
+Summary: RHN/Spacewalk action support for virtualization
Group: System Environment/Base
License: GPLv2
13 years
Changes to 'refs/tags/spacewalk-java-1.5.30-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.30-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-17 14:09 +0000
Tagging package [spacewalk-java] version [1.5.30-1] in directory [java/].
Changes since spacewalk-web-1.5.11-1:
Tomas Lestach (2):
643905 - make sure hibernate doesn't use cached kickstart trees, but takes actual DB state
Automatic commit of package [spacewalk-java] release [1.5.30-1].
---
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 1 +
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 999b611ccc04129b19edaa12bd8ac04a39e2a361
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 17 16:09:29 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 07474f2..40bf1a7 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.5.29
+Version: 1.5.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 17 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.30-1
+- 643905 - make sure hibernate doesn't use cached kickstart trees, but takes
+ actual DB state (tlestach(a)redhat.com)
+
* Mon May 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
- 704446 - removed unnecessary cast to string
- fixed SQL typo
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a0ee98f..7240d27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.29-1 java/
+1.5.30-1 java/
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 96f0e4c685d5de25fb9b7718f680805fbef2f47d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 16 12:22:58 2011 +0200
643905 - make sure hibernate doesn't use cached kickstart trees, but takes actual DB state
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
index 3238ead..a5b2c86 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java
@@ -589,6 +589,7 @@ public class KickstartFactory extends HibernateFactory {
List retval = null;
String query = "KickstartableTree.findAccessibleToOrg";
session = HibernateFactory.getSession();
+ session.evict(KickstartableTree.class);
retval = session.getNamedQuery(query).
setLong("org_id", org.getId().longValue()).list();
return retval;
13 years
Changes to 'refs/tags/spacewalk-web-1.5.11-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.11-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 13:33 +0000
Tagging package [spacewalk-web] version [1.5.11-1] in directory [web/].
Changes since spacewalk-config-1.5.4-1:
Jan Pazdziora (2):
Removal of create_channel_families and create_channels made InvalidEntryError unused, removing.
Refactoring of make_evr made MakeEvrError unused, removing.
Michael Mraka (1):
702684 - made MPM_Header compatible with RPM_Header
Miroslav Suchý (2):
spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent -> equivalent, equivalence, univalent
Automatic commit of package [spacewalk-web] release [1.5.11-1].
---
backend/common/rhn_mpm.py | 3 +++
backend/server/rhnChannel.py | 3 ---
backend/server/rhnDependency.py | 3 ---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 ++++++--
5 files changed, 10 insertions(+), 9 deletions(-)
---
13 years
2 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 2c64dc8496df64a8f0e576ecbb94a38c7fd16704
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 15:33:34 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.11-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index e603a37..0b24adf 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.10-1 web/
+1.5.11-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 36c3d04..5a88888 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.10
+Version: 1.5.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.11-1
+- spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent ->
+ equivalent, equivalence, univalent (msuchy(a)redhat.com)
+
* Tue May 17 2011 Miroslav Suchý 1.5.10-1
- add GPLv2 LICENSE
- migrate .htaccess files to apache core configuration
commit 1d44ee55756c2ca15b3e72305de8b1eb3656ce5f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 15:32:38 2011 +0200
spacewalk-pxt.noarch: W: spelling-error %description -l en_US equlivalent -> equivalent, equivalence, univalent
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 16cec48..36c3d04 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -97,7 +97,7 @@ Provides: rhn-pxt = 5.3.0
%description -n spacewalk-pxt
This package is the core software of the new Spacewalk site. It is responsible
for HTML, XML, WML, HDML, and SOAP output of data. It is more or less
-equlivalent to things like Apache::ASP and Mason
+equivalent to things like Apache::ASP and Mason
%package -n spacewalk-sniglets
13 years
2 commits - backend/server
by Jan Pazdziora
backend/server/rhnChannel.py | 3 ---
backend/server/rhnDependency.py | 3 ---
2 files changed, 6 deletions(-)
New commits:
commit 1e78556fe9468611e9cfd49de9f11dc43ddb2444
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 17 11:47:04 2011 +0200
Refactoring of make_evr made MakeEvrError unused, removing.
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index 4641c68..8afc925 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -284,9 +284,6 @@ class SolveDependenciesError(Exception):
self.deps = deps
self.packages = packages
-class MakeEvrError(SolveDependenciesError):
- pass
-
def __single_query_with_arch_and_id(server_id, deps, query):
""" Run one of the queries and return the results along with the arch. """
ret = {}
commit 3a9554d9e68d38436faf0d7a5131ab3921ffb44e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 17 11:43:02 2011 +0200
Removal of create_channel_families and create_channels made InvalidEntryError unused, removing.
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index c123b96..b3db511 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -55,9 +55,6 @@ class ModifiedError(ChannelException):
class IncompatibilityError(Exception):
pass
-class InvalidEntryError(Exception):
- pass
-
class InvalidDataError(Exception):
pass
13 years
backend/common
by Michael Mraka
backend/common/rhn_mpm.py | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 64bdfa60edcb850508548138439b3179202726c7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 17 11:35:39 2011 +0200
702684 - made MPM_Header compatible with RPM_Header
fixing
rhnpush --newest package*.mpm
...
ERROR: unhandled exception occurred: ('dict' object has no attribute 'unload').
diff --git a/backend/common/rhn_mpm.py b/backend/common/rhn_mpm.py
index 1306f61..19bd783 100644
--- a/backend/common/rhn_mpm.py
+++ b/backend/common/rhn_mpm.py
@@ -117,6 +117,9 @@ class MPM_Header:
def checksum_type(self):
return MPM_CHECKSUM_TYPE
+ def unload(self):
+ return None
+
class InvalidPackageError(Exception):
pass
13 years
Changes to 'refs/tags/spacewalk-config-1.5.4-1'
by Miroslav Suchý
Tag 'spacewalk-config-1.5.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 06:57 +0000
Tagging package [spacewalk-config] version [1.5.4-1] in directory [spacewalk/config/].
Changes since oracle-lib-compat-11.2.0.5-1:
Miroslav Suchý (32):
cleanup - system_list is not referenced from anywhere
migrate .htaccess from network/systems/groups to apache core configuration
migrate .htaccess from network/systems/details to apache core configuration
migrate .htaccess from network/systems/details/history to apache core configuration
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
migrate .htaccess from network/systems/details/kickstart to apache core configuration
migrate .htaccess from network/systems/details/proxy to apache core configuration
migrate .htaccess from network/systems/ssm to apache core configuration
migrate .htaccess from network/systems/ssm/misc to apache core configuration
migrate .htaccess from network/systems/ssm/groups to apache core configuration
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
migrate .htaccess from network/ to apache core configuration
migrate .htaccess from network/users to apache core configuration
migrate .htaccess from network/users/details to apache core configuration
migrate .htaccess from network/users/details/contact_methods to apache core configuration
migrate .htaccess from network/monitoring to apache core configuration
migrate .htaccess from network/monitoring/scout to apache core configuration
migrate .htaccess from network/components to apache core configuration
migrate .htaccess from network/software/channels to apache core configuration
migrate .htaccess from network/software/channels/manage to apache core configuration
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
migrate .htaccess from network/software/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
migrate .htaccess from network/errata to apache core configuration
migrate .htaccess from network/errata/manage to apache core configuration
migrate .htaccess from nav/ to apache core configuration
migrate .htaccess from formletters/ to apache core configuration
migrate .htaccess from applications/ to apache core configuration
add GPLv2 LICENSE
Automatic commit of package [spacewalk-web] release [1.5.10-1].
Automatic commit of package [spacewalk-config] release [1.5.4-1].
---
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
spacewalk/config/spacewalk-config.spec | 5
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
36 files changed, 658 insertions(+), 407 deletions(-)
---
13 years
Changes to 'refs/tags/spacewalk-web-1.5.10-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.10-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-17 06:57 +0000
Tagging package [spacewalk-web] version [1.5.10-1] in directory [web/].
Changes since oracle-lib-compat-11.2.0.5-1:
Miroslav Suchý (31):
cleanup - system_list is not referenced from anywhere
migrate .htaccess from network/systems/groups to apache core configuration
migrate .htaccess from network/systems/details to apache core configuration
migrate .htaccess from network/systems/details/history to apache core configuration
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
migrate .htaccess from network/systems/details/kickstart to apache core configuration
migrate .htaccess from network/systems/details/proxy to apache core configuration
migrate .htaccess from network/systems/ssm to apache core configuration
migrate .htaccess from network/systems/ssm/misc to apache core configuration
migrate .htaccess from network/systems/ssm/groups to apache core configuration
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
migrate .htaccess from network/ to apache core configuration
migrate .htaccess from network/users to apache core configuration
migrate .htaccess from network/users/details to apache core configuration
migrate .htaccess from network/users/details/contact_methods to apache core configuration
migrate .htaccess from network/monitoring to apache core configuration
migrate .htaccess from network/monitoring/scout to apache core configuration
migrate .htaccess from network/components to apache core configuration
migrate .htaccess from network/software/channels to apache core configuration
migrate .htaccess from network/software/channels/manage to apache core configuration
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
migrate .htaccess from network/software/packages to apache core configuration
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
migrate .htaccess from network/errata to apache core configuration
migrate .htaccess from network/errata/manage to apache core configuration
migrate .htaccess from nav/ to apache core configuration
migrate .htaccess from formletters/ to apache core configuration
migrate .htaccess from applications/ to apache core configuration
add GPLv2 LICENSE
Automatic commit of package [spacewalk-web] release [1.5.10-1].
---
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
34 files changed, 653 insertions(+), 405 deletions(-)
---
13 years
32 commits - rel-eng/packages spacewalk/config web/html web/LICENSE web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-config | 2
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 307 +++++++++
spacewalk/config/spacewalk-config.spec | 5
web/LICENSE | 339 ++++++++++
web/html/applications/.htaccess | 8
web/html/formletters/.htaccess | 8
web/html/nav/.htaccess | 8
web/html/network/.htaccess | 10
web/html/network/components/.htaccess | 8
web/html/network/errata/.htaccess | 6
web/html/network/errata/manage/.htaccess | 9
web/html/network/monitoring/.htaccess | 6
web/html/network/monitoring/scout/.htaccess | 8
web/html/network/software/channels/.htaccess | 15
web/html/network/software/channels/manage/.htaccess | 9
web/html/network/software/channels/manage/errata/.htaccess | 9
web/html/network/software/channels/manage/packages/.htaccess | 9
web/html/network/software/channels/manage/packages/compare/.htaccess | 10
web/html/network/software/packages/.htaccess | 13
web/html/network/systems/.htaccess | 6
web/html/network/systems/details/.htaccess | 30
web/html/network/systems/details/history/.htaccess | 6
web/html/network/systems/details/history/snapshots/.htaccess | 7
web/html/network/systems/details/kickstart/.htaccess | 7
web/html/network/systems/details/proxy/.htaccess | 8
web/html/network/systems/groups/.htaccess | 71 --
web/html/network/systems/ssm/.htaccess | 7
web/html/network/systems/ssm/groups/.htaccess | 7
web/html/network/systems/ssm/misc/.htaccess | 35 -
web/html/network/systems/ssm/provisioning/.htaccess | 7
web/html/network/systems/system_list | 52 -
web/html/network/users/.htaccess | 7
web/html/network/users/details/.htaccess | 9
web/html/network/users/details/contact_methods/.htaccess | 8
web/spacewalk-web.spec | 7
36 files changed, 658 insertions(+), 407 deletions(-)
New commits:
commit 46a22b3162e37d1929d35474050f6d8e3d87dc81
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:57:37 2011 +0200
Automatic commit of package [spacewalk-config] release [1.5.4-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 5ffc19a..24368e7 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.5.3-1 spacewalk/config/
+1.5.4-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 9014100..8d7bb7c 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -105,6 +105,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* || :
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.4-1
+- migrate .htaccess files to apache core configuration
+
* Tue May 03 2011 Jan Pazdziora 1.5.3-1
- We restrict access to some files that were too open in the past (some of them
are not tracked by rpm).
commit 35e61c9f56a63779d4b72107175b51b6eedceaae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:57:02 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 67c69c3..e603a37 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.9-1 web/
+1.5.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e7f25f6..16cec48 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.9
+Version: 1.5.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 17 2011 Miroslav Suchý 1.5.10-1
+- add GPLv2 LICENSE
+- migrate .htaccess files to apache core configuration
+
* Mon May 16 2011 Miroslav Suchý 1.5.9-1
- cleanup - removing old files, and unused sections in .htaccess
commit f5e757c6a73411aa260f333e256045cc8fce09ef
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:53:16 2011 +0200
add GPLv2 LICENSE
diff --git a/web/LICENSE b/web/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/web/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3164f77..e7f25f6 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -223,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/DB.pm
%{perl_vendorlib}/PXT/Config.pm
%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
+%doc LICENSE
%files -n spacewalk-dobby
%defattr(644,root,root,755)
commit 4d0354dba85b8d6d598c9414feab0eb0ff527a1f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:45:22 2011 +0200
migrate .htaccess from applications/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 0b93194..423646d 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -399,3 +399,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/applications">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/applications/.htaccess b/web/html/applications/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/applications/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit 7812a69513419766b451ab0f40589d9d90bb0d7f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:43:42 2011 +0200
migrate .htaccess from formletters/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 9d20b41..0b93194 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -392,3 +392,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/formletters">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/formletters/.htaccess b/web/html/formletters/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/formletters/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit 01b6dc2bcd7ea1973d4e8db43168122ae69d9b9e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:42:10 2011 +0200
migrate .htaccess from nav/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 6d5a758..9d20b41 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -385,3 +385,10 @@ PerlModule PXT::ApacheAuth
PerlSetVar errata_context manage
</Directory>
+
+<Directory "/var/www/html/nav">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/nav/.htaccess b/web/html/nav/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/nav/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit eac8be4357bc898a4a20e5ea40165cc1986db0ff
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:40:16 2011 +0200
migrate .htaccess from network/errata/manage to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 48a61f9..6d5a758 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -376,3 +376,12 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/errata/manage">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(channel_admin)
+
+ PerlSetVar errata_context manage
+</Directory>
diff --git a/web/html/network/errata/manage/.htaccess b/web/html/network/errata/manage/.htaccess
deleted file mode 100644
index 304f6f5..0000000
--- a/web/html/network/errata/manage/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(channel_admin)
-
-PerlSetVar errata_context manage
commit 56047c053fe8c9802d7a5f1e86d39b8f9ffb54dd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:38:40 2011 +0200
migrate .htaccess from network/errata to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index c7f3523..48a61f9 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -368,3 +368,11 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/errata">
+ <Files errata_list>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/errata/.htaccess b/web/html/network/errata/.htaccess
deleted file mode 100644
index 3cf9c39..0000000
--- a/web/html/network/errata/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files errata_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit c0d7e2c6bbd709710d324967ae6489a9e0f626f6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:36:57 2011 +0200
migrate .htaccess from network/software/channels/manage/errata to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e418b1e..c7f3523 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -359,3 +359,12 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/errata">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/errata/.htaccess b/web/html/network/software/channels/manage/errata/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/errata/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 4e5bacc703478c2afd6ef1e9dba98ea99e873b92
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:29:46 2011 +0200
migrate .htaccess from network/software/packages to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e6fcf53..e418b1e 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -345,3 +345,17 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/packages">
+ <Files package_map_raw>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+
+ <Files view_readme>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/software/packages/.htaccess b/web/html/network/software/packages/.htaccess
deleted file mode 100644
index d0bb12d..0000000
--- a/web/html/network/software/packages/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-<Files package_map_raw>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
-
-<Files view_readme>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 52b8b81e1f5f2a5f6f41668cb1b3d8009f58604c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:27:54 2011 +0200
migrate .htaccess from network/software/channels/manage/packages/compare to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 4a8545a..e6fcf53 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -336,3 +336,12 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/packages/compare">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/packages/compare/.htaccess b/web/html/network/software/channels/manage/packages/compare/.htaccess
deleted file mode 100644
index b119c59..0000000
--- a/web/html/network/software/channels/manage/packages/compare/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
-
commit d0fa12001f71d90a8212d547e0f92ff4901eed1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:26:26 2011 +0200
migrate .htaccess from network/software/channels/manage/packages to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 17d4695..4a8545a 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -327,3 +327,12 @@ PerlModule PXT::ApacheAuth
PerlSetVar channel_context manage
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage/packages">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/packages/.htaccess b/web/html/network/software/channels/manage/packages/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/packages/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 17b60b2e6d304f792cedc7b0bb722a1c6dbe5867
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:24:45 2011 +0200
migrate .htaccess from network/software/channels/manage to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 0f457d7..17d4695 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -318,3 +318,12 @@ PerlModule PXT::ApacheAuth
require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
</Files>
</Directory>
+
+<Directory "/var/www/html/network/software/channels/manage">
+ AuthType Basic
+ AuthName "RHN Channel Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_can_manage_channels()
+
+ PerlSetVar channel_context manage
+</Directory>
diff --git a/web/html/network/software/channels/manage/.htaccess b/web/html/network/software/channels/manage/.htaccess
deleted file mode 100644
index 7f741b8..0000000
--- a/web/html/network/software/channels/manage/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_can_manage_channels()
-
-PerlSetVar channel_context manage
commit 7c9085453c7b4e2b479d645f103757ccd2abbea5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 17 08:23:25 2011 +0200
migrate .htaccess from network/software/channels to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index be1b565..0f457d7 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -304,3 +304,17 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require no-access
</Directory>
+
+<Directory "/var/www/html/network/software/channels">
+ AuthType Basic
+ AuthName "RHN Channel Area"
+ PerlAuthenHandler PXT::ApacheAuth
+
+ <Files subscribers.pxt>
+ require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
+ </Files>
+
+ <Files managers.pxt>
+ require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
+ </Files>
+</Directory>
diff --git a/web/html/network/software/channels/.htaccess b/web/html/network/software/channels/.htaccess
deleted file mode 100644
index a34cdbd..0000000
--- a/web/html/network/software/channels/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
-<Files subscribers.pxt>
- require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
-</Files>
-
-<Files managers.pxt>
- require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);user_role(channel_admin);user_can_admin_channel()
-</Files>
-
commit 5fd1fe71f5b01439cab1781f302fc606a23c31a8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 21:05:54 2011 +0200
migrate .htaccess from network/components to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index a8d7b4f..be1b565 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -297,3 +297,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(monitoring_admin)
</Directory>
+
+<Directory "/var/www/html/network/components">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require no-access
+</Directory>
diff --git a/web/html/network/components/.htaccess b/web/html/network/components/.htaccess
deleted file mode 100644
index a1f3909..0000000
--- a/web/html/network/components/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require no-access
-
commit b37325fdf71b647b3bc97721da23209a6ea75550
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 21:03:45 2011 +0200
migrate .htaccess from network/monitoring/scout to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 060fe78..a8d7b4f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -290,3 +290,10 @@ PerlModule PXT::ApacheAuth
AuthName "RHN Monitoring Area"
PerlAuthenHandler PXT::ApacheAuth
</Directory>
+
+<Directory "/var/www/html/network/monitoring/scout">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(monitoring_admin)
+</Directory>
diff --git a/web/html/network/monitoring/scout/.htaccess b/web/html/network/monitoring/scout/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/scout/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
commit 68ad8f8279753f59aa42087ae479bf2a42dfcd24
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:55:25 2011 +0200
migrate .htaccess from network/monitoring to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 7745822..060fe78 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -284,3 +284,9 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_monitor)
</Directory>
+
+<Directory "/var/www/html/network/monitoring">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+</Directory>
diff --git a/web/html/network/monitoring/.htaccess b/web/html/network/monitoring/.htaccess
deleted file mode 100644
index 6892bf6..0000000
--- a/web/html/network/monitoring/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
commit ccfae52e7488e2f2aaebf27fe40de3be63220caf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:49:38 2011 +0200
migrate .htaccess from network/users/details/contact_methods to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 38fb99c..7745822 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -277,3 +277,10 @@ PerlModule PXT::ApacheAuth
require acl user_role(org_admin)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/users/details/contact_methods">
+ AuthType Basic
+ AuthName "RHN Monitoring Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(rhn_monitor)
+</Directory>
diff --git a/web/html/network/users/details/contact_methods/.htaccess b/web/html/network/users/details/contact_methods/.htaccess
deleted file mode 100644
index b831324..0000000
--- a/web/html/network/users/details/contact_methods/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
- AuthType Basic
- AuthName "RHN Monitoring Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl org_entitlement(rhn_monitor)
commit 64e5f41b67c6f2c05815d62267496eb31626a9f2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:47:35 2011 +0200
migrate .htaccess from network/users/details to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 5fdde26..38fb99c 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -268,3 +268,12 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
</Directory>
+
+<Directory "/var/www/html/network/users/details">
+ <Files delete_confirm.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin)
+ </Files>
+</Directory>
diff --git a/web/html/network/users/details/.htaccess b/web/html/network/users/details/.htaccess
deleted file mode 100644
index 094e49d..0000000
--- a/web/html/network/users/details/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-<Files delete_confirm.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit b883c9b586a0521332821ff8498d73c772a40b29
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:45:11 2011 +0200
migrate .htaccess from network/users to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e894d3d..5fdde26 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -261,3 +261,10 @@ PerlModule PXT::ApacheAuth
DirectoryIndex index.pxt
Options -Indexes
</Directory>
+
+<Directory "/var/www/html/network/users">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
+</Directory>
diff --git a/web/html/network/users/.htaccess b/web/html/network/users/.htaccess
deleted file mode 100644
index 169b348..0000000
--- a/web/html/network/users/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
commit 3f4dcd8cce9e8f9739a4e3a05553e66dea41778c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:42:02 2011 +0200
migrate .htaccess from network/ to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 950a9e9..e894d3d 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -252,3 +252,12 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
</Directory>
+
+<Directory "/var/www/html/network">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require valid-user
+ DirectoryIndex index.pxt
+ Options -Indexes
+</Directory>
diff --git a/web/html/network/.htaccess b/web/html/network/.htaccess
deleted file mode 100644
index 253b00f..0000000
--- a/web/html/network/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require valid-user
-
-DirectoryIndex index.pxt
-Options -Indexes
commit b206aed2c5bd66225448ad2f2f3458fd9eca98ad
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 20:40:00 2011 +0200
migrate .htaccess from network/systems/ssm/provisioning to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 4803998..950a9e9 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -245,3 +245,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/provisioning">
+ AuthType Basic
+ AuthName "RHN Custom Info Management"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(rhn_provisioning)
+</Directory>
diff --git a/web/html/network/systems/ssm/provisioning/.htaccess b/web/html/network/systems/ssm/provisioning/.htaccess
deleted file mode 100644
index d7c6b76..0000000
--- a/web/html/network/systems/ssm/provisioning/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Custom Info Management"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl org_entitlement(rhn_provisioning)
commit 8d65389708f770d01aa05d7f2e169ebb8eafdad9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:54:50 2011 +0200
migrate .htaccess from network/systems/ssm/groups to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 2a190ec..4803998 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -238,3 +238,10 @@ PerlModule PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/groups">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
+</Directory>
diff --git a/web/html/network/systems/ssm/groups/.htaccess b/web/html/network/systems/ssm/groups/.htaccess
deleted file mode 100644
index 169b348..0000000
--- a/web/html/network/systems/ssm/groups/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin); org_entitlement(sw_mgr_enterprise)
commit ef4463bd3ea43cd9b342dcbfda54e46c2d5018d2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:52:33 2011 +0200
migrate .htaccess from network/systems/ssm/misc to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index a25122f..2a190ec 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -208,3 +208,33 @@ PerlModule PXT::ApacheAuth
AuthName "RHN System Set Manager"
PerlAuthenHandler PXT::ApacheAuth
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm/misc">
+ <Files choose_value_to_remove.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files choose_value_to_set.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files set_value.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+
+ <Files remove_value.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ require acl org_entitlement(rhn_provisioning)
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/ssm/misc/.htaccess b/web/html/network/systems/ssm/misc/.htaccess
deleted file mode 100644
index 3ba65ee..0000000
--- a/web/html/network/systems/ssm/misc/.htaccess
+++ /dev/null
@@ -1,35 +0,0 @@
-<Files choose_value_to_remove.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files choose_value_to_set.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files set_value.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
-<Files remove_value.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl org_entitlement(rhn_provisioning)
-</Files>
commit 1b7af884a43c9ab220354c2b7c4c7aa4d944fc00
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:49:13 2011 +0200
migrate .htaccess from network/systems/ssm to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 3791c54..a25122f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -202,3 +202,9 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require valid-user
</Directory>
+
+<Directory "/var/www/html/network/systems/ssm">
+ AuthType Basic
+ AuthName "RHN System Set Manager"
+ PerlAuthenHandler PXT::ApacheAuth
+</Directory>
diff --git a/web/html/network/systems/ssm/.htaccess b/web/html/network/systems/ssm/.htaccess
deleted file mode 100644
index 924aab3..0000000
--- a/web/html/network/systems/ssm/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN System Set Manager"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
commit eee5cd12c5647b1902cad5c33dc2552a8ac1a09b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:47:22 2011 +0200
migrate .htaccess from network/systems/details/proxy to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 38530ba..3791c54 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -195,3 +195,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl system_feature(ftr_kickstart)
</Directory>
+
+<Directory "/var/www/html/network/systems/details/proxy">
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require valid-user
+</Directory>
diff --git a/web/html/network/systems/details/proxy/.htaccess b/web/html/network/systems/details/proxy/.htaccess
deleted file mode 100644
index 85a38d8..0000000
--- a/web/html/network/systems/details/proxy/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require valid-user
-
commit 399ab831ce50b3ea8d482c9830ebd3687411f7f2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:45:23 2011 +0200
migrate .htaccess from network/systems/details/kickstart to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 2c1fcef..38530ba 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -188,3 +188,10 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
</Directory>
+
+<Directory "/var/www/html/network/systems/details/kickstart">
+ AuthType Basic
+ AuthName "RHN Configuration Area"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl system_feature(ftr_kickstart)
+</Directory>
diff --git a/web/html/network/systems/details/kickstart/.htaccess b/web/html/network/systems/details/kickstart/.htaccess
deleted file mode 100644
index 2161c61..0000000
--- a/web/html/network/systems/details/kickstart/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Configuration Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl system_feature(ftr_kickstart)
commit 847da1ac187c6dc751621bdc45d6687c8f7d2727
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:43:17 2011 +0200
migrate .htaccess from network/systems/details/history/snapshots to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 413bb6b..2c1fcef 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -181,3 +181,10 @@ PerlModule PXT::ApacheAuth
PerlHandler PXT::ApacheHandler
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details/history/snapshots">
+ AuthType Basic
+ AuthName "RHN Custom Info Management"
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
+</Directory>
diff --git a/web/html/network/systems/details/history/snapshots/.htaccess b/web/html/network/systems/details/history/snapshots/.htaccess
deleted file mode 100644
index db3b00c..0000000
--- a/web/html/network/systems/details/history/snapshots/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Custom Info Management"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl mixin RHN::Access::System client_capable(packages.runTransaction) or client_capable(configfiles.deploy); system_feature(ftr_snapshotting)
commit 06a0a4d94937e9cb794da149cba003f355bb175f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 19:03:02 2011 +0200
migrate .htaccess from network/systems/details/history to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 73be80f..413bb6b 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -173,3 +173,11 @@ PerlModule PXT::ApacheAuth
require acl system_feature(ftr_remote_command)
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details/history">
+ <Files raw_script_output.txt>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/details/history/.htaccess b/web/html/network/systems/details/history/.htaccess
deleted file mode 100644
index 14f11ad..0000000
--- a/web/html/network/systems/details/history/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files raw_script_output.txt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit ca03a8a47a57496070bf38ec68aa1d0bfced0ad5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 18:56:57 2011 +0200
migrate .htaccess from network/systems/details to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 06fe3e3..73be80f 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -151,3 +151,25 @@ PerlModule PXT::ApacheAuth
require acl user_has_access_to_servergroup()
</Files>
</Directory>
+
+<Directory "/var/www/html/network/systems/details">
+ PerlAuthenHandler PXT::ApacheAuth
+
+ <Files proxy.pxt>
+ ForceType text/pxt
+ SetHandler perl-script
+ require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
+ </Files>
+
+ <Files activation.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ require acl system_feature(ftr_agent_smith)
+ </Files>
+
+ <Files remote_commands.pxt>
+ AuthType Basic
+ AuthName "RHN Org Admin Area"
+ require acl system_feature(ftr_remote_command)
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
deleted file mode 100644
index a815dcf..0000000
--- a/web/html/network/systems/details/.htaccess
+++ /dev/null
@@ -1,30 +0,0 @@
-<Files proxy.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
-</Files>
-
-<Files activation.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_agent_smith)
-</Files>
-
-<Files remote_commands.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_remote_command)
-</Files>
commit bbf9cea1d439f05b8fc6b025da3c1f1149d9dda7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 17:50:01 2011 +0200
migrate .htaccess from network/systems/groups to apache core configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index ee51a0c..06fe3e3 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -99,3 +99,55 @@ RewriteRule .* - [F]
ServerTokens Prod
ServerSignature Off
+
+#### Configuration for pages from spacewalk-web
+
+PerlModule PXT::ApacheHandler
+PerlModule PXT::ApacheAuth
+
+<Directory "/var/www/html/network/systems/groups">
+ AuthType Basic
+ AuthName "RHN System Group List"
+
+ PerlAuthenHandler PXT::ApacheAuth
+ require acl org_entitlement(sw_mgr_enterprise)
+
+ <Files details.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files create.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ </Files>
+
+ <Files admin_list.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files delete_confirm.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files edit_properties.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_role(system_group_admin)
+ require acl user_has_access_to_servergroup()
+ </Files>
+
+ <Files errata_list.pxt>
+ AuthType Basic
+ AuthName "RHN System Group Admin Area"
+ require acl user_has_access_to_servergroup()
+ </Files>
+</Directory>
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
deleted file mode 100644
index 8addf72..0000000
--- a/web/html/network/systems/groups/.htaccess
+++ /dev/null
@@ -1,71 +0,0 @@
-AuthType Basic
-AuthName "RHN System Group List"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl org_entitlement(sw_mgr_enterprise)
-
-<Files details.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files create.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
-</Files>
-
-<Files admin_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-
-<Files delete_confirm.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files edit_properties.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
-<Files errata_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
commit fb94fc2e8a19ea4cb288d4ea6bddae53a6ca3717
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 17:18:34 2011 +0200
cleanup - system_list is not referenced from anywhere
diff --git a/web/html/network/systems/.htaccess b/web/html/network/systems/.htaccess
deleted file mode 100644
index ebeb0af..0000000
--- a/web/html/network/systems/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files system_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list
deleted file mode 100644
index 2e36da1..0000000
--- a/web/html/network/systems/system_list
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-replacement mode="legend_canvas">
- <rhn-list-legend type="systems" file="/network/components/legends/system-list-legend.pxi" />
- </grail-canvas-replacement>
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-formvar>
-<rhn-pathinfo-list-mode type="system">
- <h1><img src="/img/rhn-icon-system.gif" alt="system" /> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1>
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name">
- <formvars>
- <var name="view_mode" />
- <var name="cfam_id" />
- </formvars>
-
- <set name="users selected systems" label="system_list" acl="org_entitlement(sw_mgr_enterprise)" />
-
- <column name="Updates" label="advisory_icon" align="center" width="5%" />
-
- <rhn-require acl="org_entitlement(rhn_monitor)">
- <column name="Health" label="monitoring_icon" align="center" width="5%" />
- </rhn-require>
-
- <column name="Errata" label="total_errata" align="center" width="5%">
- <url>/network/systems/details/errata_list.pxt?sid={column:id}</url>
- </column>
- <column name="Packages" label="outdated_packages" align="center" width="5%">
- <url>/network/systems/details/packages/upgrade.pxt?sid={column:id}</url>
- </column>
- <column name="System" label="server_name" sort_by="1" align="left" width="35%">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
- <column name="Base Channel" label="channel_labels" align="left" />
- <column name="Entitlement" label="entitlement_level" width="5%"/>
-
- <empty_list_message>No {pinfo_list_name}</empty_list_message>
-</rhn-listview>
-
-</rhn-pathinfo-list-mode>
-
-</pxt-formvar>
-
- </grail-canvas-template>
-</pxt-passthrough>
13 years
Changes to 'refs/tags/oracle-lib-compat-11.2.0.5-1'
by Jan Pazdziora
Tag 'oracle-lib-compat-11.2.0.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 12:07 +0000
Tagging package [oracle-lib-compat] version [11.2.0.5-1] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-web-1.5.9-1:
Jan Pazdziora (2):
Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
Automatic commit of package [oracle-lib-compat] release [11.2.0.5-1].
---
projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 +-
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years
2 commits - projects/oracle-lib-compat rel-eng/packages
by Jan Pazdziora
projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 +-
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit bab6c3960bfff5a7faad8d28a78be7bc0dc83ac8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 14:07:48 2011 +0200
Automatic commit of package [oracle-lib-compat] release [11.2.0.5-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 82dc01b..b118cdf 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -1,5 +1,5 @@
Name: oracle-lib-compat
-Version: 11.2.0.4
+Version: 11.2.0.5
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -115,6 +115,9 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* Mon May 16 2011 Jan Pazdziora 11.2.0.5-1
+- Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
+
* Wed May 04 2011 Jan Pazdziora 11.2.0.4-1
- We unset LD_PRELOAD to force ldd to show the libldap line with => even if
LD_PRELOAD was already set.
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index bb21bea..1116db0 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.4-1 projects/oracle-lib-compat/
+11.2.0.5-1 projects/oracle-lib-compat/
commit 674f5f5df6af1fd9cc419895496df4a720397c41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 14:06:18 2011 +0200
Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
Albeit with tomcat6 it only seems to be needed on s390x, not on Intel
platforms.
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
index ee14820..0e29f49 100644
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ b/projects/oracle-lib-compat/tomcat-setenv.sh
@@ -1,6 +1,6 @@
# To address bug 623115/627859, we need to override the ldap_* symbols
-# in libclntsh.so* upon tomcat5 startup with those from standard library.
+# in libclntsh.so* upon tomcat* startup with those from standard library.
for i in /lib64/security/pam_ldap.so /lib/security/pam_ldap.so ; do
if [ -f $i ] ; then
# to force ldd to show the libldap line with => even if LD_PRELOAD was already set
13 years
Changes to 'refs/tags/spacewalk-web-1.5.9-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-16 11:57 +0000
Tagging package [spacewalk-web] version [1.5.9-1] in directory [web/].
Changes since spacewalk-setup-1.5.6-1:
Miroslav Suchý (2):
file /var/www/html/.htaccess has been removed
Automatic commit of package [spacewalk-web] release [1.5.9-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
13 years
2 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2b088e82f873087e471c79f445a4c13599a3c9a1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:57:34 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.9-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 67d3476..67c69c3 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.8-1 web/
+1.5.9-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 087db2d..3164f77 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.8
+Version: 1.5.9
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
+* Mon May 16 2011 Miroslav Suchý 1.5.9-1
+- cleanup - removing old files, and unused sections in .htaccess
+
* Tue May 10 2011 Jan Pazdziora 1.5.8-1
- Fix remote command schedule date on postgresql (Ville.Salmela(a)csc.fi)
commit 770a258ececcfe526da9b6c37100a35e5954776a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:56:07 2011 +0200
file /var/www/html/.htaccess has been removed
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 32230ef..087db2d 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -253,7 +253,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n spacewalk-html
%defattr(644,root,root,755)
%{_var}/www/html/*
-%{_var}/www/html/.htaccess
# $Id$
%changelog
13 years
Changes to 'refs/tags/spacewalk-setup-1.5.6-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 11:55 +0000
Tagging package [spacewalk-setup] version [1.5.6-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.5.22-1:
Jan Pazdziora (2):
We only want to source the setenv.sh if it exists.
Automatic commit of package [spacewalk-setup] release [1.5.6-1].
Miroslav Suchý (9):
cleanup - page admin_group_list.pxt is not used any more
cleanup - page target_group_list.pxt is not used any more
cleanup - page update_confirm.pxt is not used any more
cleanup - page namespaces.pxt is not used any more
cleanup - page probe_list is not used any more
cleanup - page downloads.pxt is not used any more and having empty section does not make sense either
cleanup - page users.pxt is not used any more
cleanup - page list is not used any more
cleanup - page errata is not used any more
---
rel-eng/packages/spacewalk-setup | 2 -
spacewalk/setup/share/tomcatX.conf.3 | 2 -
spacewalk/setup/spacewalk-setup.spec | 5 ++-
web/html/.htaccess | 6 ----
web/html/network/errata/manage/.htaccess | 7 ----
web/html/network/monitoring/.htaccess | 7 ----
web/html/network/software/channels/.htaccess | 3 --
web/html/network/software/channels/manage/.htaccess | 4 --
web/html/network/systems/details/.htaccess | 30 --------------------
web/html/network/systems/ssm/provisioning/.htaccess | 10 ------
10 files changed, 6 insertions(+), 70 deletions(-)
---
13 years
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c90d359483c0625c0dacee28fd927aa255745c40
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:55:11 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.6-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index cd5b824..71c1ea4 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.5-1 spacewalk/setup/
+1.5.6-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index c762e0e..3138c8b 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Mon May 16 2011 Jan Pazdziora 1.5.6-1
+- We only want to source the setenv.sh if it exists.
+
* Wed May 11 2011 Jan Pazdziora 1.5.5-1
- Actually package the new tomcatX.conf.3 (for the tomcat6 setenv.sh issue) in
the rpm.
13 years
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/share/tomcatX.conf.3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2f25ae8bd221204751ce5b9a4e08641c34fdf6d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:50:33 2011 +0200
We only want to source the setenv.sh if it exists.
Addressing
/etc/tomcat6/tomcat6.conf: line 58: /usr/share/tomcat6/bin/setenv.sh: No such file or directory
diff --git a/spacewalk/setup/share/tomcatX.conf.3 b/spacewalk/setup/share/tomcatX.conf.3
index 6269ee7..aba1bdf 100644
--- a/spacewalk/setup/share/tomcatX.conf.3
+++ b/spacewalk/setup/share/tomcatX.conf.3
@@ -1,2 +1,2 @@
^_HACK_AROUND_PARSEOPTIONS=1.+setenv\.sh\n
-_HACK_AROUND_PARSEOPTIONS=1 ; . $CATALINA_HOME/bin/setenv.sh
+_HACK_AROUND_PARSEOPTIONS=1 ; test -f $CATALINA_HOME/bin/setenv.sh && . $CATALINA_HOME/bin/setenv.sh
13 years
9 commits - web/html
by Miroslav Suchý
web/html/.htaccess | 6 ----
web/html/network/errata/manage/.htaccess | 7 ----
web/html/network/monitoring/.htaccess | 7 ----
web/html/network/software/channels/.htaccess | 3 --
web/html/network/software/channels/manage/.htaccess | 4 --
web/html/network/systems/details/.htaccess | 30 --------------------
web/html/network/systems/ssm/provisioning/.htaccess | 10 ------
7 files changed, 67 deletions(-)
New commits:
commit 3609b6c3f93b915246ed815af701af96e690ee88
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:46:56 2011 +0200
cleanup - page errata is not used any more
diff --git a/web/html/.htaccess b/web/html/.htaccess
deleted file mode 100644
index 9d7a845..0000000
--- a/web/html/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files errata>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 8978b8420b6aab511dcabac574dcddae0711c28f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:45:28 2011 +0200
cleanup - page list is not used any more
diff --git a/web/html/network/errata/manage/.htaccess b/web/html/network/errata/manage/.htaccess
index 8cc2651..304f6f5 100644
--- a/web/html/network/errata/manage/.htaccess
+++ b/web/html/network/errata/manage/.htaccess
@@ -7,10 +7,3 @@ PerlAuthenHandler PXT::ApacheAuth
require acl user_role(channel_admin)
PerlSetVar errata_context manage
-
-<Files list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit db743e5374a743ab4435c396ef5220e0ad638053
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:42:05 2011 +0200
cleanup - page users.pxt is not used any more
diff --git a/web/html/network/software/channels/manage/.htaccess b/web/html/network/software/channels/manage/.htaccess
index 0392eca..7f741b8 100644
--- a/web/html/network/software/channels/manage/.htaccess
+++ b/web/html/network/software/channels/manage/.htaccess
@@ -6,8 +6,4 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_can_manage_channels()
-<Files users.pxt>
-require acl mixin RHN::Access::Channel user_role(channel_admin)
-</Files>
-
PerlSetVar channel_context manage
commit 8ba9393324eedf3ca888785aeadebdd914d952ee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:40:49 2011 +0200
cleanup - page downloads.pxt is not used any more and having empty section does not make sense either
diff --git a/web/html/network/software/channels/.htaccess b/web/html/network/software/channels/.htaccess
index be7f2bb..a34cdbd 100644
--- a/web/html/network/software/channels/.htaccess
+++ b/web/html/network/software/channels/.htaccess
@@ -5,9 +5,6 @@ PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
-<Files downloads.pxt>
-</Files>
-
<Files subscribers.pxt>
require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
</Files>
commit 33425bc3b5b428b8c00ec66582f194891a485350
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:39:20 2011 +0200
cleanup - page probe_list is not used any more
diff --git a/web/html/network/monitoring/.htaccess b/web/html/network/monitoring/.htaccess
index 305693a..6892bf6 100644
--- a/web/html/network/monitoring/.htaccess
+++ b/web/html/network/monitoring/.htaccess
@@ -4,10 +4,3 @@ AuthName "RHN Monitoring Area"
PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
-
-<Files probe_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 0439d4e5f18889e497af7816eb4fed75ff721aeb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:37:10 2011 +0200
cleanup - page namespaces.pxt is not used any more
diff --git a/web/html/network/systems/ssm/provisioning/.htaccess b/web/html/network/systems/ssm/provisioning/.htaccess
index ee5b727..d7c6b76 100644
--- a/web/html/network/systems/ssm/provisioning/.htaccess
+++ b/web/html/network/systems/ssm/provisioning/.htaccess
@@ -5,13 +5,3 @@ PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
-
-<Files namespaces.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl mixin RHN::Access::System user_role(config_admin)
-</Files>
-
commit e6b14beba11ed00d44c35baedf97027b2843abb6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:33:32 2011 +0200
cleanup - page update_confirm.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 74801db..a815dcf 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -18,18 +18,6 @@
require acl system_feature(ftr_agent_smith)
</Files>
-
-<Files update_confirm.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_package_updates)
-</Files>
-
<Files remote_commands.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
commit aac77c739fe6ed890fb0abca6f97e0a8d598a6ea
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:32:59 2011 +0200
cleanup - page target_group_list.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 269d088..74801db 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -7,15 +7,6 @@
require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
</Files>
-<Files target_group_list.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl user_role(org_admin) or user_role(system_group_admin); system_feature(ftr_system_grouping)
-</Files>
-
<Files activation.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
commit 63234a65111b218ce4cd9aa4e8462d4e11ef6134
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:32:28 2011 +0200
cleanup - page admin_group_list.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 0d714c9..269d088 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -7,15 +7,6 @@
require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
</Files>
-<Files admin_group_list.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl user_role(org_admin) or user_role(system_group_admin); system_feature(ftr_system_grouping)
-</Files>
-
<Files target_group_list.pxt>
ForceType text/pxt
SetHandler perl-script
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.22-1'
by mcalmer
Tag 'spacewalk-backend-1.5.22-1' created by Michael Calmer <mc(a)suse.de> at 2011-05-16 11:36 +0000
Tagging package [spacewalk-backend] version [1.5.22-1] in directory [backend/].
Changes since perl-NOCpulse-Probe-1.184.8-1:
Michael Calmer (6):
fix encoding of package summary and description
use fix_encoding method
test if checksum_type exists before accessing it
inherit from DependencyItem like other dep classes
fix sql statements for weak deps (pg)
Automatic commit of package [spacewalk-backend] release [1.5.22-1].
---
backend/satellite_tools/satsync.py | 2 +-
backend/satellite_tools/xmlSource.py | 18 +++---------------
backend/server/importlib/packageImport.py | 16 ++++++++++++----
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
web/modules/rhn/RHN/DB/Package.pm | 12 ++++++------
6 files changed, 30 insertions(+), 28 deletions(-)
---
13 years
6 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages web/modules
by mcalmer
backend/satellite_tools/satsync.py | 2 +-
backend/satellite_tools/xmlSource.py | 18 +++---------------
backend/server/importlib/packageImport.py | 16 ++++++++++++----
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
web/modules/rhn/RHN/DB/Package.pm | 12 ++++++------
6 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit f3788cfcdc25348e9dbb9dfca5665eef8d71aae9
Author: Michael Calmer <mc(a)suse.de>
Date: Mon May 16 13:36:02 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.22-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 981e1b5..cf7a389 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.21
+Version: 1.5.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 16 2011 Michael Calmer <mc(a)suse.de> 1.5.22-1
+- inherit from DependencyItem like other dep classes (mc(a)suse.de)
+- test if checksum_type exists before accessing it (mc(a)suse.de)
+- use fix_encoding method (mc(a)suse.de)
+- fix encoding of package summary and description (mc(a)suse.de)
+
* Fri May 13 2011 Jan Pazdziora 1.5.21-1
- 698567 - give the transaction that we have to use to read the file header a
sandbox database.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 47e1d59..3094a45 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.21-1 backend/
+1.5.22-1 backend/
commit 782f998314808b99a0dfc8502f7d6234665557c7
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 7 19:59:04 2011 +0200
fix sql statements for weak deps (pg)
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 72de143..604a822 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -351,11 +351,11 @@ sub recommends {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageRecommends P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -378,11 +378,11 @@ sub suggests {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageSuggests P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -405,11 +405,11 @@ sub supplements {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageSupplements P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
commit 958bc9a0532c6f2990d698ee476bca698beb85c8
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 14 16:16:01 2011 +0200
inherit from DependencyItem like other dep classes
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 96ea786..cac68ba 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -615,28 +615,16 @@ class ObsoletesItem(DependencyItem):
item_name = 'rhn-package-obsoletes-entry'
addItem(ObsoletesItem)
-class RecommendsItem(BaseItem):
+class RecommendsItem(DependencyItem):
item_name = 'rhn-package-recommends-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(RecommendsItem)
-class SuggestsItem(BaseItem):
+class SuggestsItem(DependencyItem):
item_name = 'rhn-package-suggests-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(SuggestsItem)
-class SupplementsItem(BaseItem):
+class SupplementsItem(DependencyItem):
item_name = 'rhn-package-supplements-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(SupplementsItem)
class FileItem(BaseChecksummedItem):
commit 0b2ac9758708b27cd77f7e20fc70155d1ffc6fd8
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 7 19:58:16 2011 +0200
test if checksum_type exists before accessing it
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 4dfaabe..1f101cd 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -909,7 +909,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
row = None
for r in (h.fetchall_dict() or []):
# let's check which checksum we have in database
- if package['checksums'][r['checksum_type']] == r['checksum']:
+ if r['checksum_type'] in package['checksums'] and package['checksums'][r['checksum_type']] == r['checksum']:
row = r
break
commit 13e96fb993ca377b0bdb47f5efc19c927e0f54ac
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 14 15:47:21 2011 +0200
use fix_encoding method
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 355c20e..7432d1d 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -244,10 +244,7 @@ class PackageImport(ChannelPackageSubscription):
# Process files too
fileList = package['files']
for f in fileList:
- try:
- filename = f['name'].decode('utf8')
- except UnicodeDecodeError:
- filename = f['name'].decode('iso8859-1')
+ filename = self._fix_encoding(f['name'])
nv = (filename, '')
del f['name']
f['capability'] = nv
commit f87ac525931423fdeea2c4a4e593cc6ea0eaf26d
Author: Michael Calmer <mc(a)suse.de>
Date: Sun May 8 19:01:28 2011 +0200
fix encoding of package summary and description
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index c03db36..355c20e 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -274,6 +274,10 @@ class PackageImport(ChannelPackageSubscription):
else:
self.package_arches['i386-solaris-patch'] = None
+ # fix encoding issues in package summary and description
+ package['description'] = self._fix_encoding(package['description'])
+ package['summary'] = self._fix_encoding(package['summary'])
+
def fix(self):
# If capabilities are available, process them
if self.capabilities:
@@ -500,6 +504,13 @@ class PackageImport(ChannelPackageSubscription):
server_packages.processPackageKeyAssociations(header,
package['checksum_type'], package['checksum'])
+ def _fix_encoding(self, text):
+ try:
+ return text.decode('utf8')
+ except UnicodeDecodeError:
+ return text.decode('iso8859-1')
+
+
class SourcePackageImport(Import):
def __init__(self, batch, backend, caller=None, update_last_modified=0):
Import.__init__(self, batch, backend)
13 years
Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.8-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-Probe-1.184.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 11:25 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.8-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since spacewalk-java-1.5.29-1:
Jan Pazdziora (2):
The database handle now has AutoCommit turned off, so begin_work is not needed anymore.
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.8-1].
---
monitoring/PerlModules/NP/Probe/monitoring-data-cleanup | 3 ---
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 6 +++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
13 years
monitoring/PerlModules rel-eng/packages
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 6 +++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3b037b80f342f6b84b0a220ce047c622db389cd0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:25:03 2011 +0200
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.8-1].
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index 7d1ac06..53ec441 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe
Summary: Monitoring probes for Spacewalk
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.184.7
+Version: 1.184.8
Release: 1%{?dist}
BuildArch: noarch
Group: Development/Libraries
@@ -146,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/NOCpulse::Probe::Shell::SQLPlus*
%changelog
+* Mon May 16 2011 Jan Pazdziora 1.184.8-1
+- The database handle now has AutoCommit turned off, so begin_work is not
+ needed anymore.
+
* Fri Mar 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.184.7-1
- fixed db connection in monitoring-data-cleanup (PG)
diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe
index 950e909..b6373b1 100644
--- a/rel-eng/packages/perl-NOCpulse-Probe
+++ b/rel-eng/packages/perl-NOCpulse-Probe
@@ -1 +1 @@
-1.184.7-1 monitoring/PerlModules/NP/Probe/
+1.184.8-1 monitoring/PerlModules/NP/Probe/
13 years
monitoring/PerlModules
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/monitoring-data-cleanup | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit bca82f24fb97aa18c456954bad14e3efe98f55ea
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:23:39 2011 +0200
The database handle now has AutoCommit turned off, so begin_work is not needed anymore.
Addressing
Deleting probes data older than 10:50:35 Apr 16, 2011...
RHN::Exception: DBD::Oracle::db begin_work failed: Already in a transaction
RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 228 RHN::Exception::DB::throw
main /usr/bin/monitoring-data-cleanup 128 RHN::DB::handle_error
diff --git a/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup b/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
index 1ee6e07..76bf296 100755
--- a/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
+++ b/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
@@ -58,7 +58,6 @@ if (%$localConfig) {
}
if ($delete_unmatched) {
- $ini->dbh->begin_work;
print "Deleting data from already deleted probes...\n";
$sql = qq|
delete from time_series
@@ -110,7 +109,6 @@ if ($interval && $delta) {
foreach my $delete_date (@date_list) {
print UnixDate($delete_date,"Deleting probes data older than %T %b %e, %Y...\n");
- $ini->dbh->begin_work;
$sth->execute(UnixDate($delete_date,"%s"));
print "\t", $sth->rows, " record deleted.\n";
$dry_run ? $ini->dbh->rollback : $ini->dbh->commit;
@@ -125,7 +123,6 @@ if ($interval && $delta) {
}
print UnixDate($date,"Deleting probes data older than %T %b %e, %Y...\n");
$sql = qq|delete from time_series where entry_time < ?|;
- $ini->dbh->begin_work;
$sth = $ini->dbh->prepare($sql);
$sth->execute(UnixDate($date,"%s"));
print "\t", $sth->rows, " record deleted.\n";
13 years
Changes to 'refs/tags/spacewalk-java-1.5.29-1'
by Michael Mraka
Tag 'spacewalk-java-1.5.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-16 08:14 +0000
Tagging package [spacewalk-java] version [1.5.29-1] in directory [java/].
Changes since spacewalk-backend-1.5.21-1:
Julian Einwag (1):
fixed SQL typo
Michael Mraka (2):
704446 - removed unnecessary cast to string
Automatic commit of package [spacewalk-java] release [1.5.29-1].
Miroslav Suchý (14):
cleanup - old certificate, not used anymore
clean up - Opt Out page is not present since sat420
cleanup - CVE functionality has been already migrated to java
documentation does not need log in
cleanup - make_vile is not used any more
cleanup - in /html/index.html is no pxt code, just pure html
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - file channel_*_perms.pxt does not exist any more
cleanup - page entitlements.pxt does not exist any more
cleanup - page target_system_list.pxt does not exist any more under network/systems/groups
cleanup - page system_list.pxt does not exist any more under network/systems/groups
---
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 4
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
web/html/.htaccess | 17
web/html/help/.htaccess | 43 --
web/html/help/RHNS-CA-CERT | 204 ----------
web/html/help/RHNS-CA-CERT.asc | 7
web/html/network/entitlement/.htaccess | 7
web/html/network/errata/manage/clone/.htaccess | 9
web/html/network/monitoring/config/.htaccess | 8
web/html/network/profiles/.htaccess | 8
web/html/network/systems/.htaccess | 10
web/html/network/systems/groups/.htaccess | 21 -
web/html/network/users/details/.htaccess | 11
web/modules/pxt/PXT/ApacheHandler.pm | 14
web/modules/pxt/PXT/Request.pm | 1
web/modules/rhn/RHN/I18N.pm | 1
19 files changed, 11 insertions(+), 368 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit df1226f7316ac40886660bebc2c09a2ae040138f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 16 10:14:47 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 45b71a2..07474f2 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.5.28
+Version: 1.5.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
+- 704446 - removed unnecessary cast to string
+- fixed SQL typo
+
* Fri May 13 2011 Jan Pazdziora 1.5.28-1
- introduce NoSuchConfigFilePathException for configchannel and server.config
APIs (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2a2ab03..a0ee98f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.28-1 java/
+1.5.29-1 java/
13 years
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 4 ++--
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit be6374188bebab573ba993c9d57f9258ad6043a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 16 10:06:43 2011 +0200
704446 - removed unnecessary cast to string
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
index e51c553..0ca196c 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
@@ -354,9 +354,9 @@ public class KickstartLister extends BaseManager {
* @param ksId kickstart profile
* @return DataResult list of timezones.
*/
- public DataResult getValidTimezones(String ksId) {
+ public DataResult getValidTimezones(Long ksId) {
if (logger.isDebugEnabled()) {
- logger.debug("getValidTimezones(ksId=" + ksId +
+ logger.debug("getValidTimezones(ksId=" + ksId.toString() +
") - start");
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
index e7c7d7a..52a18ea 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
@@ -123,7 +123,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
*/
public ArrayList getValidTimezones() {
DataResult dr = KickstartLister.getInstance()
- .getValidTimezones(getKickstartData().getId().toString());
+ .getValidTimezones(getKickstartData().getId());
Iterator iter = dr.iterator();
ArrayList ret = new ArrayList();
@@ -149,7 +149,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
public Boolean isValidTimezone(String timezone) {
DataResult dr = KickstartLister.getInstance()
- .getValidTimezones(getKickstartData().getId().toString());
+ .getValidTimezones(getKickstartData().getId());
Iterator iter = dr.iterator();
while (iter.hasNext()) {
13 years
4 commits - web/html
by Miroslav Suchý
web/html/network/systems/.htaccess | 10 ----------
web/html/network/systems/groups/.htaccess | 21 ---------------------
web/html/network/users/details/.htaccess | 11 -----------
3 files changed, 42 deletions(-)
New commits:
commit 5db6987953ea206b4645bc7e8ff1d35df7b02d91
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:06:07 2011 +0200
cleanup - page system_list.pxt does not exist any more under network/systems/groups
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
index 972a356..8addf72 100644
--- a/web/html/network/systems/groups/.htaccess
+++ b/web/html/network/systems/groups/.htaccess
@@ -60,16 +60,6 @@ require acl org_entitlement(sw_mgr_enterprise)
require acl user_has_access_to_servergroup()
</Files>
-<Files system_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
-
<Files errata_list.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
commit e83c70395f232e388adeb9c915f8d0a02ae51569
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:05:04 2011 +0200
cleanup - page target_system_list.pxt does not exist any more under network/systems/groups
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
index 1a4741d..972a356 100644
--- a/web/html/network/systems/groups/.htaccess
+++ b/web/html/network/systems/groups/.htaccess
@@ -49,17 +49,6 @@ require acl org_entitlement(sw_mgr_enterprise)
require acl user_has_access_to_servergroup()
</Files>
-<Files target_system_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
<Files edit_properties.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
commit 10936b44a55fd0b9ae0b6692f563d40ccd9bd564
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:02:16 2011 +0200
cleanup - page entitlements.pxt does not exist any more
diff --git a/web/html/network/systems/.htaccess b/web/html/network/systems/.htaccess
index e57bedf..ebeb0af 100644
--- a/web/html/network/systems/.htaccess
+++ b/web/html/network/systems/.htaccess
@@ -4,13 +4,3 @@
PerlModule PXT::ApacheHandler
PerlHandler PXT::ApacheHandler
</Files>
-
-<Files entitlements.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit beab3e674c486b8dd577c307cddb07bcfa697d27
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:01:27 2011 +0200
cleanup - file channel_*_perms.pxt does not exist any more
diff --git a/web/html/network/users/details/.htaccess b/web/html/network/users/details/.htaccess
index 458e78c..094e49d 100644
--- a/web/html/network/users/details/.htaccess
+++ b/web/html/network/users/details/.htaccess
@@ -7,14 +7,3 @@
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin)
</Files>
-
-<Files channel_*_perms.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(channel_admin)
-</Files>
-
13 years
4 commits - web/html
by Miroslav Suchý
web/html/network/entitlement/.htaccess | 7 -------
web/html/network/errata/manage/clone/.htaccess | 9 ---------
web/html/network/monitoring/config/.htaccess | 8 --------
web/html/network/profiles/.htaccess | 8 --------
4 files changed, 32 deletions(-)
New commits:
commit 341eed9833febdb9a96458fe436516055a61e7c5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:57:15 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/entitlement/.htaccess b/web/html/network/entitlement/.htaccess
deleted file mode 100644
index 0baffef..0000000
--- a/web/html/network/entitlement/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin)
commit 6c44f1dc4ad672ee10f049da303f3d7442ff76b9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:56:08 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/errata/manage/clone/.htaccess b/web/html/network/errata/manage/clone/.htaccess
deleted file mode 100644
index 304f6f5..0000000
--- a/web/html/network/errata/manage/clone/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(channel_admin)
-
-PerlSetVar errata_context manage
commit 3fa0ee32bb1f451466ffc5c302b21c9029beb802
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:55:37 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/profiles/.htaccess b/web/html/network/profiles/.htaccess
deleted file mode 100644
index 73aae80..0000000
--- a/web/html/network/profiles/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
-require acl org_entitlement(sw_mgr_enterprise)
commit 1fa8c14d0f503e698a9b2a7ce0ccc9ab58781c29
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:53:52 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/monitoring/config/.htaccess b/web/html/network/monitoring/config/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/config/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
13 years
3 commits - web/html web/modules
by Miroslav Suchý
web/html/help/.htaccess | 43 -----------------------------------
web/modules/pxt/PXT/ApacheHandler.pm | 14 -----------
web/modules/pxt/PXT/Request.pm | 1
web/modules/rhn/RHN/I18N.pm | 1
4 files changed, 59 deletions(-)
New commits:
commit 42234ad1fb3d1cde69689cdb9f1efa9d51cf3c30
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:45:22 2011 +0200
cleanup - in /html/index.html is no pxt code, just pure html
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
deleted file mode 100644
index 0845de9..0000000
--- a/web/html/help/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files *.html>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit fec4c2b13e420505b09200d39ef6bb5bba6f4a72
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:44:07 2011 +0200
cleanup - make_vile is not used any more
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
index cbc3944..0845de9 100644
--- a/web/html/help/.htaccess
+++ b/web/html/help/.htaccess
@@ -4,6 +4,3 @@
PerlModule PXT::ApacheHandler
PerlHandler PXT::ApacheHandler
</Files>
-
-PerlSetVar pxt_make_vile off
-
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index 949a240..4cb66c3 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -46,13 +46,9 @@ use RHN::Mail;
use PXT::Debug ();
use RHN::DB ();
-our $make_vile;
-
sub handler {
my $r = shift;
-
- local $make_vile = 0;
$ENV{PATH} = "/bin:/usr/sbin";
return DECLINED unless
@@ -170,16 +166,6 @@ sub handler {
$file_contents = RHN::I18N->translate($file_contents);
}
- if ($file_contents =~ '<((rhn|pxt)-.*?)>') {
- warn "tag $1 seems to be unhandled?";
- $make_vile = "green";
- }
-
- if ($r->dir_config("pxt_make_vile") and $r->dir_config("pxt_make_vile") eq 'on' and $make_vile) {
- $file_contents =~ s/<body>/<body bgcolor="$make_vile">/;
- $file_contents =~ s(<link[^>]*>)()g;
- }
-
# Turn on byte pragma to get correct content length, and then turn it back off.
use bytes;
$r->headers_out->{'Content-Length'} = length $file_contents;
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index a61f091..55d8ab2 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -308,7 +308,6 @@ sub param {
}
else {
warn "Access to formvar '$var' not allowed: formvar not cleansed - ", join(", ", caller);
- $PXT::ApacheHandler::make_vile = "#ffff00";
}
}
diff --git a/web/modules/rhn/RHN/I18N.pm b/web/modules/rhn/RHN/I18N.pm
index 74124f6..3708e95 100644
--- a/web/modules/rhn/RHN/I18N.pm
+++ b/web/modules/rhn/RHN/I18N.pm
@@ -40,7 +40,6 @@ sub translate {
if (not $doc) {
warn "I18N XML Parsing failed: $@";
- $PXT::ApacheHandler::make_vile = "#ff98d6";
return $input;
}
commit 5f4472137214076b63bf17d82855fa95fd357b2e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:24:21 2011 +0200
documentation does not need log in
and this names are old/not used anymore anyway
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
index a52732d..cbc3944 100644
--- a/web/html/help/.htaccess
+++ b/web/html/help/.htaccess
@@ -1,37 +1,3 @@
-<Files RHN-channel-mgmt-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-<Files RHN-proxy-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-
-<Files RHN-satellite-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-<Files RHN-client-config-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-
<Files *.html>
ForceType text/pxt
SetHandler perl-script
13 years
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1032f3b62a976446776da2223692cc750d6b0755
Author: Julian Einwag <je(a)rockenstein.de>
Date: Mon May 16 09:37:17 2011 +0200
fixed SQL typo
diff --git a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
index 534149b..3895fca 100644
--- a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
@@ -76,7 +76,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Org.accessibleChannels">
<![CDATA[SELECT {c.*}
- FROM rhnChannel {c},
+ FROM rhnChannel {c}
LEFT JOIN rhnChannelCloned c_1_
ON c.id = c_1_.original_id
JOIN rhnAvailableChannels cfp
13 years
2 commits - web/html
by Miroslav Suchý
web/html/.htaccess | 17 -----------------
1 file changed, 17 deletions(-)
New commits:
commit c5d217e753ea01bf9f1cd9b4caa45a3cfb55c92e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 17:04:06 2011 +0200
cleanup - CVE functionality has been already migrated to java
diff --git a/web/html/.htaccess b/web/html/.htaccess
index 594fbe8..9d7a845 100644
--- a/web/html/.htaccess
+++ b/web/html/.htaccess
@@ -4,11 +4,3 @@
PerlModule PXT::ApacheHandler
PerlHandler PXT::ApacheHandler
</Files>
-
-<Files cve>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
-
commit 0c560ba4033493e6d05acada0427342843d66dc1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 17:01:11 2011 +0200
clean up - Opt Out page is not present since sat420
diff --git a/web/html/.htaccess b/web/html/.htaccess
index cc16c6b..594fbe8 100644
--- a/web/html/.htaccess
+++ b/web/html/.htaccess
@@ -12,12 +12,3 @@
PerlHandler PXT::ApacheHandler
</Files>
-<Files oo.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require valid-user
-</Files>
13 years
web/html
by Miroslav Suchý
web/html/help/RHNS-CA-CERT | 204 -----------------------------------------
web/html/help/RHNS-CA-CERT.asc | 7 -
2 files changed, 211 deletions(-)
New commits:
commit 02a1f48314aba70591b493c5a05953016b938af2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 16:35:14 2011 +0200
cleanup - old certificate, not used anymore
diff --git a/web/html/help/RHNS-CA-CERT b/web/html/help/RHNS-CA-CERT
deleted file mode 100644
index 51094d0..0000000
--- a/web/html/help/RHNS-CA-CERT
+++ /dev/null
@@ -1,204 +0,0 @@
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 0 (0x0)
- Signature Algorithm: md5WithRSAEncryption
- Issuer: C=US, ST=North Carolina, L=Research Triangle Park, O=Red Hat, Inc., OU=Red Hat Network Services, CN=RHNS Certificate Authority/Email=rhns(a)redhat.com
- Validity
- Not Before: Aug 23 22:45:55 2000 GMT
- Not After : Aug 28 22:45:55 2003 GMT
- Subject: C=US, ST=North Carolina, L=Research Triangle Park, O=Red Hat, Inc., OU=Red Hat Network Services, CN=RHNS Certificate Authority/Email=rhns(a)redhat.com
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- RSA Public Key: (1024 bit)
- Modulus (1024 bit):
- 00:c0:68:2b:12:30:e2:21:2d:22:c6:72:71:5b:bf:
- 17:a0:93:10:e9:9b:e3:c9:8d:3b:2d:ac:c4:bb:95:
- 3b:e0:ca:55:32:dc:95:c2:10:b3:04:b2:51:fb:e8:
- 85:61:16:34:a5:b4:1d:67:5c:a7:77:f4:f0:92:da:
- b4:8b:af:95:93:62:f3:66:29:ae:c0:88:b7:64:84:
- 0e:48:90:60:f8:60:3e:00:7f:54:dd:17:a6:ac:18:
- e0:42:de:7c:be:90:81:f7:f4:05:85:0a:08:cc:d5:
- f2:9f:fc:24:8b:77:a5:3d:e9:48:a9:ef:0f:3b:63:
- a3:fe:a6:83:4c:e8:dc:0b:77
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Subject Key Identifier:
- 54:15:CD:9F:2C:F7:EC:0D:1F:D2:A8:BE:4C:07:AC:88:3E:FB:9B:0A
- X509v3 Authority Key Identifier:
- keyid:54:15:CD:9F:2C:F7:EC:0D:1F:D2:A8:BE:4C:07:AC:88:3E:FB:9B:0A
- DirName:/C=US/ST=North Carolina/L=Research Triangle Park/O=Red Hat, Inc./OU=Red Hat Network Services/CN=RHNS Certificate Authority/Email=rhns(a)redhat.com
- serial:00
-
- X509v3 Basic Constraints:
- CA:TRUE
- Signature Algorithm: md5WithRSAEncryption
- 93:01:88:88:67:67:91:8c:9e:d0:12:14:90:71:12:87:55:0a:
- f2:52:1b:ad:f2:d3:07:1d:af:70:99:bb:b0:cd:80:23:c9:ed:
- 2b:73:e9:63:b1:d0:b3:8c:60:c5:42:64:a6:c1:95:56:90:c5:
- 35:06:03:58:f5:8e:2b:d9:f9:a9:a0:10:a9:99:f7:15:42:92:
- a5:50:d7:11:07:f1:02:d5:e0:70:e4:55:6e:2a:ce:25:f8:5d:
- cd:0b:2f:10:61:f8:f6:20:42:cc:c3:89:f8:8a:4f:82:24:12:
- cf:39:7f:21:a8:2c:8d:52:97:52:c5:f7:5f:42:a5:87:09:66:
- b0:cc
------BEGIN CERTIFICATE-----
-MIIEMDCCA5mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBxzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMR8wHQYDVQQHExZSZXNlYXJjaCBUcmlh
-bmdsZSBQYXJrMRYwFAYDVQQKEw1SZWQgSGF0LCBJbmMuMSEwHwYDVQQLExhSZWQg
-SGF0IE5ldHdvcmsgU2VydmljZXMxIzAhBgNVBAMTGlJITlMgQ2VydGlmaWNhdGUg
-QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9yaG5zQHJlZGhhdC5jb20wHhcNMDAw
-ODIzMjI0NTU1WhcNMDMwODI4MjI0NTU1WjCBxzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAgTDk5vcnRoIENhcm9saW5hMR8wHQYDVQQHExZSZXNlYXJjaCBUcmlhbmdsZSBQ
-YXJrMRYwFAYDVQQKEw1SZWQgSGF0LCBJbmMuMSEwHwYDVQQLExhSZWQgSGF0IE5l
-dHdvcmsgU2VydmljZXMxIzAhBgNVBAMTGlJITlMgQ2VydGlmaWNhdGUgQXV0aG9y
-aXR5MR4wHAYJKoZIhvcNAQkBFg9yaG5zQHJlZGhhdC5jb20wgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAMBoKxIw4iEtIsZycVu/F6CTEOmb48mNOy2sxLuVO+DK
-VTLclcIQswSyUfvohWEWNKW0HWdcp3f08JLatIuvlZNi82YprsCIt2SEDkiQYPhg
-PgB/VN0XpqwY4ELefL6Qgff0BYUKCMzV8p/8JIt3pT3pSKnvDztjo/6mg0zo3At3
-AgMBAAGjggEoMIIBJDAdBgNVHQ4EFgQUVBXNnyz37A0f0qi+TAesiD77mwowgfQG
-A1UdIwSB7DCB6YAUVBXNnyz37A0f0qi+TAesiD77mwqhgc2kgcowgccxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEfMB0GA1UEBxMWUmVzZWFy
-Y2ggVHJpYW5nbGUgUGFyazEWMBQGA1UEChMNUmVkIEhhdCwgSW5jLjEhMB8GA1UE
-CxMYUmVkIEhhdCBOZXR3b3JrIFNlcnZpY2VzMSMwIQYDVQQDExpSSE5TIENlcnRp
-ZmljYXRlIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYPcmhuc0ByZWRoYXQuY29t
-ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAkwGIiGdnkYye0BIU
-kHESh1UK8lIbrfLTBx2vcJm7sM2AI8ntK3PpY7HQs4xgxUJkpsGVVpDFNQYDWPWO
-K9n5qaAQqZn3FUKSpVDXEQfxAtXgcORVbirOJfhdzQsvEGH49iBCzMOJ+IpPgiQS
-zzl/IagsjVKXUsX3X0KlhwlmsMw=
------END CERTIFICATE-----
-
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 0 (0x0)
- Signature Algorithm: md5WithRSAEncryption
- Issuer: C=US, ST=North Carolina, L=Raleigh, O=Red Hat, Inc., OU=Red Hat Network, CN=RHN Certificate Authority/Email=rhn-noc(a)redhat.com
- Validity
- Not Before: Sep 5 20:45:16 2002 GMT
- Not After : Sep 9 20:45:16 2007 GMT
- Subject: C=US, ST=North Carolina, L=Raleigh, O=Red Hat, Inc., OU=Red Hat Network, CN=RHN Certificate Authority/Email=rhn-noc(a)redhat.com
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- RSA Public Key: (1024 bit)
- Modulus (1024 bit):
- 00:b3:16:b7:c5:f5:b9:69:51:1f:cd:b4:3d:70:cf:
- 60:57:85:a4:2a:a7:5d:28:22:0e:ec:19:e2:92:f7:
- 48:97:a6:a6:1f:51:95:83:11:8f:9a:98:a2:90:e0:
- cb:4a:24:19:94:a8:8a:4b:88:b4:06:6c:ce:77:d7:
- 15:3b:3c:cd:66:83:cf:23:1d:0d:bc:0a:0c:cb:1f:
- cb:40:fb:f3:d9:fe:2a:b4:85:2c:7b:c9:a1:fe:f3:
- 8f:68:1d:f2:12:b1:a4:16:19:ce:0f:b8:9a:9c:d9:
- bc:5f:49:62:b2:95:93:ce:5d:2e:dd:79:3c:f1:5b:
- a6:b7:a2:b5:39:0d:8e:12:31
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Subject Key Identifier:
- 7F:1B:64:A1:2E:02:C5:A8:7D:B8:D1:B1:8B:06:9D:A3:A9:50:63:92
- X509v3 Authority Key Identifier:
- keyid:7F:1B:64:A1:2E:02:C5:A8:7D:B8:D1:B1:8B:06:9D:A3:A9:50:63:92
- DirName:/C=US/ST=North Carolina/L=Raleigh/O=Red Hat, Inc./OU=Red Hat Network/CN=RHN Certificate Authority/Email=rhn-noc(a)redhat.com
- serial:00
-
- X509v3 Basic Constraints:
- CA:TRUE
- Signature Algorithm: md5WithRSAEncryption
- 28:4d:42:e5:34:22:dd:c6:86:63:04:75:52:67:17:45:72:f2:
- 3b:21:2b:45:59:72:73:f7:59:36:9d:57:43:c6:dc:94:0f:0e:
- ff:13:5c:4f:50:37:85:b2:e4:c2:1f:35:9f:74:f4:e7:53:fb:
- a1:06:b8:39:ce:e4:0a:86:7b:5f:28:5d:c7:11:9e:12:a5:d6:
- b9:6c:e9:18:09:d5:f0:42:e7:54:b5:91:9e:23:ad:12:7a:aa:
- 72:7c:39:3c:83:f8:75:a4:7b:03:92:ff:2a:d4:c5:76:19:12:
- fa:b4:3b:b0:89:2c:95:8c:01:90:0d:d8:ba:06:05:61:00:ac:
- 95:da
------BEGIN CERTIFICATE-----
-MIID7jCCA1egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsTELMAkGA1UEBhMCVVMx
-FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
-VQQKEw1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLEw9SZWQgSGF0IE5ldHdvcmsxIjAg
-BgNVBAMTGVJITiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEW
-EnJobi1ub2NAcmVkaGF0LmNvbTAeFw0wMjA5MDUyMDQ1MTZaFw0wNzA5MDkyMDQ1
-MTZaMIGxMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAO
-BgNVBAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsT
-D1JlZCBIYXQgTmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhv
-cml0eTEhMB8GCSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQCzFrfF9blpUR/NtD1wz2BXhaQqp10oIg7sGeKS
-90iXpqYfUZWDEY+amKKQ4MtKJBmUqIpLiLQGbM531xU7PM1mg88jHQ28CgzLH8tA
-+/PZ/iq0hSx7yaH+849oHfISsaQWGc4PuJqc2bxfSWKylZPOXS7deTzxW6a3orU5
-DY4SMQIDAQABo4IBEjCCAQ4wHQYDVR0OBBYEFH8bZKEuAsWofbjRsYsGnaOpUGOS
-MIHeBgNVHSMEgdYwgdOAFH8bZKEuAsWofbjRsYsGnaOpUGOSoYG3pIG0MIGxMQsw
-CQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcTB1Jh
-bGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsTD1JlZCBIYXQg
-TmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhvcml0eTEhMB8G
-CSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEEBQADgYEAKE1C5TQi3caGYwR1UmcXRXLyOyErRVlyc/dZNp1X
-Q8bclA8O/xNcT1A3hbLkwh81n3T051P7oQa4Oc7kCoZ7XyhdxxGeEqXWuWzpGAnV
-8ELnVLWRniOtEnqqcnw5PIP4daR7A5L/KtTFdhkS+rQ7sIkslYwBkA3YugYFYQCs
-ldo=
------END CERTIFICATE-----
-
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 0 (0x0)
- Signature Algorithm: md5WithRSAEncryption
- Issuer: C=US, ST=North Carolina, L=Raleigh, O=Red Hat, Inc., OU=Red Hat Network, CN=RHN Certificate Authority/emailAddress=rhn-noc(a)redhat.com
- Validity
- Not Before: Aug 29 02:10:55 2003 GMT
- Not After : Aug 26 02:10:55 2013 GMT
- Subject: C=US, ST=North Carolina, L=Raleigh, O=Red Hat, Inc., OU=Red Hat Network, CN=RHN Certificate Authority/emailAddress=rhn-noc(a)redhat.com
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- RSA Public Key: (1024 bit)
- Modulus (1024 bit):
- 00:bf:61:63:eb:3d:8b:2b:45:48:e6:c2:fb:7c:d2:
- 21:21:b8:ec:90:93:41:30:7c:2c:8d:79:d5:14:e9:
- 0e:7e:3f:ef:d6:0a:9b:0a:a6:02:52:01:2d:26:96:
- a4:ed:bd:a9:9e:aa:08:03:c1:61:0a:41:80:ea:ae:
- 74:cc:61:26:d0:05:91:55:3e:66:14:a2:20:b3:d6:
- 9d:71:0c:ab:77:cc:f4:f0:11:b5:25:33:8a:4e:22:
- 9a:10:36:67:fa:11:6d:48:76:3a:1f:d2:e3:44:7b:
- 89:66:be:b4:85:fb:2f:a6:aa:13:fa:9a:6d:c9:bb:
- 18:c4:04:af:4f:15:69:89:9b
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Subject Key Identifier:
- 69:44:27:05:DC:2E:ED:A5:F4:81:C4:D7:78:45:E7:44:5D:F8:87:47
- X509v3 Authority Key Identifier:
- keyid:69:44:27:05:DC:2E:ED:A5:F4:81:C4:D7:78:45:E7:44:5D:F8:87:47
- DirName:/C=US/ST=North Carolina/L=Raleigh/O=Red Hat, Inc./OU=Red Hat Network/CN=RHN Certificate Authority/emailAddress=rhn-noc(a)redhat.com
- serial:00
-
- X509v3 Basic Constraints:
- CA:TRUE
- Signature Algorithm: md5WithRSAEncryption
- 23:c9:ca:07:9f:5e:96:39:83:e0:4e:da:dd:47:84:30:ca:d4:
- d5:38:86:f9:de:88:83:ca:2c:47:26:36:ab:f4:14:1e:28:29:
- de:7d:10:4a:5e:91:3e:5a:99:07:0c:a9:2e:e3:fb:78:44:49:
- c5:32:d6:e8:7a:97:ff:29:d0:33:ae:26:ba:76:06:7e:79:97:
- 17:0c:4f:2d:2a:8b:8a:ac:41:59:ae:e9:c4:55:2d:b9:88:df:
- 9b:7b:41:f8:32:2e:ee:c9:c0:59:e2:30:57:5e:37:47:29:c0:
- 2d:78:33:d3:ce:a3:2b:dc:84:da:bf:3b:2e:4b:b6:b3:b6:4e:
- 9e:80
------BEGIN CERTIFICATE-----
-MIID7jCCA1egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsTELMAkGA1UEBhMCVVMx
-FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
-VQQKEw1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLEw9SZWQgSGF0IE5ldHdvcmsxIjAg
-BgNVBAMTGVJITiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEW
-EnJobi1ub2NAcmVkaGF0LmNvbTAeFw0wMzA4MjkwMjEwNTVaFw0xMzA4MjYwMjEw
-NTVaMIGxMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAO
-BgNVBAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsT
-D1JlZCBIYXQgTmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhv
-cml0eTEhMB8GCSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQC/YWPrPYsrRUjmwvt80iEhuOyQk0EwfCyNedUU
-6Q5+P+/WCpsKpgJSAS0mlqTtvameqggDwWEKQYDqrnTMYSbQBZFVPmYUoiCz1p1x
-DKt3zPTwEbUlM4pOIpoQNmf6EW1Idjof0uNEe4lmvrSF+y+mqhP6mm3JuxjEBK9P
-FWmJmwIDAQABo4IBEjCCAQ4wHQYDVR0OBBYEFGlEJwXcLu2l9IHE13hF50Rd+IdH
-MIHeBgNVHSMEgdYwgdOAFGlEJwXcLu2l9IHE13hF50Rd+IdHoYG3pIG0MIGxMQsw
-CQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcTB1Jh
-bGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsTD1JlZCBIYXQg
-TmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhvcml0eTEhMB8G
-CSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEEBQADgYEAI8nKB59eljmD4E7a3UeEMMrU1TiG+d6Ig8osRyY2
-q/QUHigp3n0QSl6RPlqZBwypLuP7eERJxTLW6HqX/ynQM64munYGfnmXFwxPLSqL
-iqxBWa7pxFUtuYjfm3tB+DIu7snAWeIwV143RynALXgz086jK9yE2r87Lku2s7ZO
-noA=
------END CERTIFICATE-----
diff --git a/web/html/help/RHNS-CA-CERT.asc b/web/html/help/RHNS-CA-CERT.asc
deleted file mode 100644
index 9b1eec0..0000000
--- a/web/html/help/RHNS-CA-CERT.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.7 (GNU/Linux)
-
-iD8DBQE/TsIqIZGAzdtCpg4RAj03AJ9Y+fj8UWEepsewkz+FvCqK19Ap3QCgmtwj
-xkb8E4gRJAgmjON/Xm/qr5k=
-=qpvb
------END PGP SIGNATURE-----
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.21-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-13 13:35 +0000
Tagging package [spacewalk-backend] version [1.5.21-1] in directory [backend/].
Changes since spacewalk-java-1.5.28-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.5.21-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 62a6c808501a0056226c0f79322e58a291bd752f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 13 15:35:52 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.21-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 351629c..981e1b5 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.20
+Version: 1.5.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 13 2011 Jan Pazdziora 1.5.21-1
+- 698567 - give the transaction that we have to use to read the file header a
+ sandbox database.
+
* Fri May 13 2011 Miroslav Suchý 1.5.20-1
- 695651 - mod_wsgi change header, flip it back to what we expect
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ffc504d..47e1d59 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.20-1 backend/
+1.5.21-1 backend/
13 years
Changes to 'refs/tags/spacewalk-java-1.5.28-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-13 13:35 +0000
Tagging package [spacewalk-java] version [1.5.28-1] in directory [java/].
Changes since NPalert-1.126.23-1:
Jan Pazdziora (2):
698567 - give the transaction that we have to use to read the file header a sandbox database.
Automatic commit of package [spacewalk-java] release [1.5.28-1].
Tomas Lestach (1):
introduce NoSuchConfigFilePathException for configchannel and server.config APIs
---
backend/common/rhn_rpm.py | 10 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchConfigFilePathException.java | 48 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 18 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 8 +
java/spacewalk-java.spec | 8 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 91 insertions(+), 3 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit e9994fb24e8d460d0a273bab4de9d0cc56f3954f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 13 15:35:29 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3d2fbd9..45b71a2 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.5.27
+Version: 1.5.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 13 2011 Jan Pazdziora 1.5.28-1
+- introduce NoSuchConfigFilePathException for configchannel and server.config
+ APIs (tlestach(a)redhat.com)
+- 703143 - changed (+) to ANSI JOIN (michael.mraka(a)redhat.com)
+- 678721 - errata.cloneAsOriginal API call (mzazrivec(a)redhat.com)
+
* Wed May 11 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.27-1
- 659138 - change jsp rendering when taskomatic is down (tlestach(a)redhat.com)
- 659138 - skip code, if taskomatic is down (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5d545c1..2a2ab03 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.27-1 java/
+1.5.28-1 java/
13 years
backend/common
by Jan Pazdziora
backend/common/rhn_rpm.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit cb1e1d3754c79ff4c7f71c5b9611608febb7e2c0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 13 14:22:53 2011 +0200
698567 - give the transaction that we have to use to read the file header a sandbox database.
Ever since we've prevented Spacewalk from reading the rpm database
with SELinux, it complains in the error_log:
error: cannot open Packages database in /var/lib/rpm
This workaround should give it a place to create its own database.
diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py
index 3cd1b26..631f220 100644
--- a/backend/common/rhn_rpm.py
+++ b/backend/common/rhn_rpm.py
@@ -202,7 +202,15 @@ def get_package_header(filename=None, file=None, fd=None):
if not SHARED_TS:
SHARED_TS = rpm.ts()
SHARED_TS.setVSFlags(-1)
- hdr = SHARED_TS.hdrFromFdno(file_desc)
+
+ rpm.addMacro('_dbpath', '/var/cache/rhn/rhnpush-rpmdb')
+ try:
+ hdr = SHARED_TS.hdrFromFdno(file_desc)
+ rpm.delMacro('_dbpath')
+ except:
+ rpm.delMacro('_dbpath')
+ raise
+
if hdr is None:
raise InvalidPackageError
is_source = hdr[rpm.RPMTAG_SOURCEPACKAGE]
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchConfigFilePathException.java | 48 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 18 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 8 +
3 files changed, 74 insertions(+)
New commits:
commit 79daade5da07022ba3d0c6effeeb75efc6588165
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 13 14:37:11 2011 +0200
introduce NoSuchConfigFilePathException for configchannel and server.config APIs
it's better to throw a nice excetion like:
<Fault -1029: 'redstone.xmlrpc.XmlRpcFault: No such configuration file path: /tmp/escape.txt in config channel tmp-lconfig'>
than getting:
<Fault -1: 'redstone.xmlrpc.XmlRpcFault: unhandled internal exception: null'>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchConfigFilePathException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchConfigFilePathException.java
new file mode 100644
index 0000000..d5ca987
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchConfigFilePathException.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+
+
+/**
+ * NoSuchConfigFilePathException
+ * @version $Rev$
+ */
+public class NoSuchConfigFilePathException extends FaultException {
+
+ /**
+ * Comment for <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 3053597629652431490L;
+
+ /**
+ * Constructor
+ * @param path config file path that doesn't exist
+ */
+ public NoSuchConfigFilePathException(String path) {
+ super(-1029, "noSuchConfigFilePath", "No such configuration file path: " + path);
+ }
+
+ /**
+ * Constructor
+ * @param path config file path that doesn't exist
+ * @param channelLabel in what channelLabel
+ */
+ public NoSuchConfigFilePathException(String path, String channelLabel) {
+ super(-1029, "noSuchConfigFilePath", "No such configuration file path: " + path +
+ " in config channel: " + channelLabel);
+ }
+}
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 3a2097d..7b41ec8 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
@@ -32,6 +32,7 @@ import com.redhat.rhn.frontend.dto.ConfigFileDto;
import com.redhat.rhn.frontend.dto.ConfigRevisionDto;
import com.redhat.rhn.frontend.dto.ConfigSystemDto;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
+import com.redhat.rhn.frontend.xmlrpc.NoSuchConfigFilePathException;
import com.redhat.rhn.frontend.xmlrpc.NoSuchConfigRevisionException;
import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigRevisionSerializer;
import com.redhat.rhn.manager.MissingCapabilityException;
@@ -384,6 +385,9 @@ public class ConfigChannelHandler extends BaseHandler {
List <ConfigRevision> revisions = new LinkedList<ConfigRevision>();
for (String path : paths) {
ConfigFile cf = cm.lookupConfigFile(loggedInUser, channel.getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path, channelLabel);
+ }
revisions.add(cf.getLatestConfigRevision());
}
return revisions;
@@ -423,6 +427,9 @@ public class ConfigChannelHandler extends BaseHandler {
channelLabel);
ConfigurationManager cm = ConfigurationManager.getInstance();
ConfigFile cf = cm.lookupConfigFile(loggedInUser, channel.getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path, channelLabel);
+ }
List<ConfigRevisionDto> revs = cm.listRevisionsForFile(loggedInUser, cf, null);
for (ConfigRevisionDto rev : revs) {
if (rev.getRevisionNumber().equals(revision)) {
@@ -510,8 +517,16 @@ public class ConfigChannelHandler extends BaseHandler {
ConfigChannel channel = configHelper.lookupGlobal(loggedInUser,
channelLabel);
ConfigurationManager cm = ConfigurationManager.getInstance();
+ List<ConfigFile> cfList = new ArrayList<ConfigFile>();
+ // first pass to check, whethee config files are valid
for (String path : paths) {
ConfigFile cf = cm.lookupConfigFile(loggedInUser, channel.getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path, channelLabel);
+ }
+ cfList.add(cf);
+ }
+ for (ConfigFile cf : cfList) {
cm.deleteConfigFile(loggedInUser, cf);
}
return 1;
@@ -550,6 +565,9 @@ public class ConfigChannelHandler extends BaseHandler {
// obtain the latest revision for the file provided by 'path'
Set<Long> revisions = new HashSet<Long>();
ConfigFile cf = cm.lookupConfigFile(loggedInUser, channel.getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path, channelLabel);
+ }
revisions.add(cf.getLatestConfigRevision().getRevision());
// schedule the action for the servers specified
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index ff967f2..1bbc635 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ConfigFileDto;
import com.redhat.rhn.frontend.dto.ConfigFileNameDto;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
+import com.redhat.rhn.frontend.xmlrpc.NoSuchConfigFilePathException;
import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHelper;
import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializer;
import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigRevisionSerializer;
@@ -356,16 +357,23 @@ public class ServerConfigHandler extends BaseHandler {
XmlRpcSystemHelper sysHelper = XmlRpcSystemHelper.getInstance();
ConfigurationManager cm = ConfigurationManager.getInstance();
Server server = sysHelper.lookupServer(loggedInUser, sid);
+ List<ConfigFile> cfList = new ArrayList<ConfigFile>();
for (String path : paths) {
ConfigFile cf;
if (deleteFromLocal) {
cf = cm.lookupConfigFile(loggedInUser,
server.getLocalOverride().getId(), path);
+ if (cf == null) {
+ throw new NoSuchConfigFilePathException(path);
+ }
}
else {
cf = cm.lookupConfigFile(loggedInUser,
server.getSandboxOverride().getId(), path);
}
+ cfList.add(cf);
+ }
+ for (ConfigFile cf : cfList) {
cm.deleteConfigFile(loggedInUser, cf);
}
return 1;
13 years
Changes to 'refs/tags/spacewalk-proxy-1.5.6-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-13 12:41 +0000
Tagging package [spacewalk-proxy] version [1.5.6-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-1.5.5-1:
Miroslav Suchý (8):
695651 - pass /ty-cksm handler through Broker
sgmlop parser could not return data in utf-8
do not call function twice, store it in variable
this is unmaintained list
695651 - mod_wsgi change header, flip it back to what we expect
695651 - headers_in under mod_wsgi is dict, which does not have add()
695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and not just the part beyond /
Automatic commit of package [spacewalk-proxy] release [1.5.6-1].
---
backend/spacewalk-backend.spec | 3 +++
backend/wsgi/wsgiHandler.py | 2 +-
monitoring/NPalert/NPalert.spec | 1 -
monitoring/NPalert/REQUIRES | 22 ----------------------
proxy/proxy/apacheHandler.py | 4 ++--
proxy/proxy/broker/rhnBroker.py | 12 ++++++------
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
proxy/proxy/redirect/rhnRedirect.py | 10 ++++++----
proxy/proxy/spacewalk-proxy.spec | 10 +++++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
10 files changed, 30 insertions(+), 38 deletions(-)
---
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.20-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.20-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-13 12:42 +0000
Tagging package [spacewalk-backend] version [1.5.20-1] in directory [backend/].
Changes since spacewalk-proxy-1.5.5-1:
Miroslav Suchý (9):
695651 - pass /ty-cksm handler through Broker
sgmlop parser could not return data in utf-8
do not call function twice, store it in variable
this is unmaintained list
695651 - mod_wsgi change header, flip it back to what we expect
695651 - headers_in under mod_wsgi is dict, which does not have add()
695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and not just the part beyond /
Automatic commit of package [spacewalk-proxy] release [1.5.6-1].
Automatic commit of package [spacewalk-backend] release [1.5.20-1].
---
backend/spacewalk-backend.spec | 11 ++++++++++-
backend/wsgi/wsgiHandler.py | 2 +-
monitoring/NPalert/NPalert.spec | 1 -
monitoring/NPalert/REQUIRES | 22 ----------------------
proxy/proxy/apacheHandler.py | 4 ++--
proxy/proxy/broker/rhnBroker.py | 12 ++++++------
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
proxy/proxy/redirect/rhnRedirect.py | 10 ++++++----
proxy/proxy/spacewalk-proxy.spec | 10 +++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-proxy | 2 +-
11 files changed, 38 insertions(+), 40 deletions(-)
---
13 years
Changes to 'refs/tags/NPalert-1.126.23-1'
by Miroslav Suchý
Tag 'NPalert-1.126.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-13 12:42 +0000
Tagging package [NPalert] version [1.126.23-1] in directory [monitoring/NPalert/].
Changes since spacewalk-proxy-1.5.5-1:
Miroslav Suchý (10):
695651 - pass /ty-cksm handler through Broker
sgmlop parser could not return data in utf-8
do not call function twice, store it in variable
this is unmaintained list
695651 - mod_wsgi change header, flip it back to what we expect
695651 - headers_in under mod_wsgi is dict, which does not have add()
695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and not just the part beyond /
Automatic commit of package [spacewalk-proxy] release [1.5.6-1].
Automatic commit of package [spacewalk-backend] release [1.5.20-1].
Automatic commit of package [NPalert] release [1.126.23-1].
---
backend/spacewalk-backend.spec | 11 ++++++++++-
backend/wsgi/wsgiHandler.py | 2 +-
monitoring/NPalert/NPalert.spec | 6 ++++--
monitoring/NPalert/REQUIRES | 22 ----------------------
proxy/proxy/apacheHandler.py | 4 ++--
proxy/proxy/broker/rhnBroker.py | 12 ++++++------
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
proxy/proxy/redirect/rhnRedirect.py | 10 ++++++----
proxy/proxy/spacewalk-proxy.spec | 10 +++++++++-
rel-eng/packages/NPalert | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-proxy | 2 +-
12 files changed, 43 insertions(+), 42 deletions(-)
---
13 years
3 commits - backend/spacewalk-backend.spec monitoring/NPalert proxy/proxy rel-eng/packages
by Miroslav Suchý
backend/spacewalk-backend.spec | 8 +++++++-
monitoring/NPalert/NPalert.spec | 5 ++++-
proxy/proxy/spacewalk-proxy.spec | 10 +++++++++-
rel-eng/packages/NPalert | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-proxy | 2 +-
6 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit ab7b46231cac29f3c7677fc34eb60522d9dca97d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:42:58 2011 +0200
Automatic commit of package [NPalert] release [1.126.23-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 998820c..6fcd4ef 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.22
+Version: 1.126.23
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
+* Fri May 13 2011 Miroslav Suchý 1.126.23-1
+- removing unmaintained file with dependencies
+
* Wed Apr 27 2011 Jan Pazdziora 1.126.22-1
- Neither functions from File::Basename nor from File::Copy seem to be used by
ack-processor, removing the uses.
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index b95d637..4620fb0 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.22-1 monitoring/NPalert/
+1.126.23-1 monitoring/NPalert/
commit 0587f6ccb93041c67b29bcc00991374aec21abe4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:42:05 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.20-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0bdfb71..351629c 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.19
+Version: 1.5.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri May 13 2011 Miroslav Suchý 1.5.20-1
+- 695651 - mod_wsgi change header, flip it back to what we expect
+ (msuchy(a)redhat.com)
+- sgmlop parser could not return data in utf-8 (msuchy(a)redhat.com)
+- 695651 - mimic req.connection.local_addr from mod_python (msuchy(a)redhat.com)
+
* Mon May 09 2011 Jan Pazdziora 1.5.19-1
- rhn-satellite-exporter with start-date and end-date (jbrazdil(a)redhat.com)
- fix utf-8 in emails (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 83f1371..ffc504d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.19-1 backend/
+1.5.20-1 backend/
commit 49418f9319e2a9c05705b7cc6f66f92c34eab039
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:41:37 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.6-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 826bd49..6ad72a2 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,14 @@ fi
%changelog
+* Fri May 13 2011 Miroslav Suchý 1.5.6-1
+- 695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and
+ not just the part beyond / (msuchy(a)redhat.com)
+- 695651 - headers_in under mod_wsgi is dict, which does not have add()
+ (msuchy(a)redhat.com)
+- do not call function twice, store it in variable (msuchy(a)redhat.com)
+- 695651 - pass /ty-cksm handler through Broker (msuchy(a)redhat.com)
+
* Wed May 11 2011 Miroslav Suchý 1.5.5-1
- 695651 - is_virtual is not exposed in mod_wsgi (msuchy(a)redhat.com)
- 695651 - pass /ty handler through Broker (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 241b2a9..31c4612 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.5-1 proxy/proxy/
+1.5.6-1 proxy/proxy/
13 years
5 commits - backend/wsgi monitoring/NPalert proxy/proxy
by Miroslav Suchý
backend/wsgi/wsgiHandler.py | 2 +-
monitoring/NPalert/NPalert.spec | 1 -
monitoring/NPalert/REQUIRES | 22 ----------------------
proxy/proxy/apacheHandler.py | 4 ++--
proxy/proxy/broker/rhnBroker.py | 12 ++++++------
proxy/proxy/redirect/rhnRedirect.py | 10 ++++++----
6 files changed, 15 insertions(+), 36 deletions(-)
New commits:
commit fe696f9007270e4644fa062c2d91385a88a1d148
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:36:20 2011 +0200
695651 - in mod_wsgi the URI is full URI (incl. protocol, hostname...) and not just the part beyond /
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index cd270cf..b96bf46 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -20,6 +20,7 @@ import time
import string
import socket
import re
+from urlparse import urlsplit, urlparse, urlunparse
# common module imports
from spacewalk.common.rhnLib import parseUrl
@@ -100,12 +101,13 @@ class BrokerHandler(SharedHandler):
scheme = 'http'
# self.{caChain,httpProxy*,rhnParent} initialized in rhnShared.py
effectiveURI = self._getEffectiveURI()
+ effectiveURI_parts = urlparse(effectiveURI)
if req.method == 'GET':
scheme = 'http'
self.httpProxy = CFG.SQUID
self.caChain = self.httpProxyUsername = self.httpProxyPassword = ''
- if CFG.HTTP_PROXY or CFG.USE_SSL or re.search('^'+URI_PREFIX_KS_CHECKSUM, effectiveURI):
+ if CFG.HTTP_PROXY or CFG.USE_SSL or re.search('^'+URI_PREFIX_KS_CHECKSUM, effectiveURI_parts[2]):
# o if we need to go through an outside HTTP proxy, use the
# redirect
# o if an SSL request, use the redirect
@@ -120,11 +122,8 @@ class BrokerHandler(SharedHandler):
scheme = 'http'
self.caChain = ''
- self.rhnParentXMLRPC = scheme + '://' + self.rhnParent + '/XMLRPC'
- self.rhnParent = scheme + \
- '://' + \
- self.rhnParent + \
- effectiveURI)
+ self.rhnParentXMLRPC = urlunparse((scheme, self.rhnParent, '/XMLRPC', '', '', ''))
+ self.rhnParent = urlunparse((scheme, self.rhnParent) + effectiveURI_parts[2:])
log_debug(2, 'set self.rhnParent: %s' % self.rhnParent)
log_debug(2, 'set self.rhnParentXMLRPC: %s' % self.rhnParentXMLRPC)
diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py
index b5f8abe..3245187 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -19,6 +19,7 @@
import string
import socket
import re
+from urlparse import urlparse, urlunparse
# common module imports
from spacewalk.common.rhnConfig import CFG
@@ -60,13 +61,14 @@ class RedirectHandler(SharedHandler):
"""
effectiveURI = self._getEffectiveURI()
+ effectiveURI_parts = urlparse(effectiveURI)
+ scheme = 'http'
if CFG.USE_SSL:
- self.rhnParentXMLRPC = 'https://' + self.rhnParent + '/XMLRPC'
- self.rhnParent = 'https://' + self.rhnParent + effectiveURI
+ scheme = 'https'
else:
- self.rhnParentXMLRPC = 'http://' + self.rhnParent + '/XMLRPC'
- self.rhnParent = 'http://' + self.rhnParent + effectiveURI
self.caChain = ''
+ self.rhnParentXMLRPC = urlunparse((scheme, self.rhnParent, '/XMLRPC', '', '', ''))
+ self.rhnParent = urlunparse((scheme, self.rhnParent) + effectiveURI_parts[2:])
log_debug(3, 'remapped self.rhnParent: %s' % self.rhnParent)
log_debug(3, 'remapped self.rhnParentXMLRPC: %s' % self.rhnParentXMLRPC)
commit 68b171b1dc1f11d56a6b6cdb2dbc94d928efd582
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:35:50 2011 +0200
695651 - headers_in under mod_wsgi is dict, which does not have add()
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index c5a3178..8881c90 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -171,8 +171,8 @@ class apacheHandler(rhnApache):
# so that the content handler can use it later.
log_debug(3, "Generated new kickstart URI: %s" % newURI)
- req.headers_in.add(HEADER_ACTUAL_URI, req.uri)
- req.headers_in.add(HEADER_EFFECTIVE_URI, newURI)
+ req.headers_in[HEADER_ACTUAL_URI] = req.uri
+ req.headers_in[HEADER_EFFECTIVE_URI] = newURI
return apache.OK
commit 537a7587beb04036bb2fea88b1b8727277bb2709
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 14:35:07 2011 +0200
695651 - mod_wsgi change header, flip it back to what we expect
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index deefe20..68d58f3 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -19,7 +19,7 @@ from wsgi import wsgiRequest
def handle(environ, start_response, server, component_type, type="spacewalk.server.apacheServer"):
#wsgi seems to capitalize incoming headers and add HTTP- to the front :/
# so we strip out the first 5 letters, and transform it into what we want.
- replacements = {'_':'-', 'Rhn':'RHN', 'Md5Sum':'MD5sum', 'Xml':'XML'}
+ replacements = {'_':'-', 'Rhn':'RHN', 'Md5Sum':'MD5sum', 'Xml':'XML', 'Actualuri': 'ActualURI'}
for key in environ.keys():
if key[:5] == "HTTP_":
new_key = key[5:].title()
commit d8daef7ff281f8000b76284f0af81dfe935e40ac
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 13 09:48:23 2011 +0200
this is unmaintained list
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index b4192a7..998820c 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -13,7 +13,6 @@ Version: 1.126.22
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-#Requires: perl perl(Config::IniFiles) perl(DBI) perl(DBD::Oracle) perl(Class::MethodMaker) perl(Error) perl(Date::Manip) perl-TimeDate perl-MailTools perl-NOCpulse-Probe perl-libwww-perl perl(URI) perl(HTML::Parser) perl(FreezeThaw)
Group: Applications/Communications
License: GPLv2
Requires: nocpulse-common smtpdaemon
diff --git a/monitoring/NPalert/REQUIRES b/monitoring/NPalert/REQUIRES
deleted file mode 100644
index 196e768..0000000
--- a/monitoring/NPalert/REQUIRES
+++ /dev/null
@@ -1,22 +0,0 @@
-NPusers-1.10.1-0
-Config-IniFiles-2.20.0-1
-#FreezeThaw-1.0.1-1
-openssl-0.9.6a-7.i386.rpm
-Crypt-SSLeay-0.21.0-0
-DBI-1.0.1-1.i386.rpm
-DBD-Oracle-1.0.2-1
-IO-1.22.0-0.i386.rpm
-IPC-Open3-1.0103-1.i386.rpm
-Class-MethodMaker-1.05.1-2
-Error-1.1.0-1
-OracleClient-1.1.0-1
-Date-Manip-1.0.0-1
-perl-TimeDate-1.09-1
-MailTools-1.17.0-0
-NOCpulse-OracleDB-1.19.0-0
-NOCpulse-Probe-1.92.0-0
-NOCpulse-Utils-1.10.0-2
-Test-Unit-0.14-2
-libwww-perl-5.50.0-0
-URI-1.11.0-0
-HTML-Parser-3.15.0-0
commit 3afecc9b81ab72e15ec74a3f3d77f35f5253e4e0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 12 17:21:50 2011 +0200
do not call function twice, store it in variable
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 2849668..cd270cf 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -99,12 +99,13 @@ class BrokerHandler(SharedHandler):
scheme = 'http'
# self.{caChain,httpProxy*,rhnParent} initialized in rhnShared.py
+ effectiveURI = self._getEffectiveURI()
if req.method == 'GET':
scheme = 'http'
self.httpProxy = CFG.SQUID
self.caChain = self.httpProxyUsername = self.httpProxyPassword = ''
- if CFG.HTTP_PROXY or CFG.USE_SSL or re.search('^'+URI_PREFIX_KS_CHECKSUM, self._getEffectiveURI()):
+ if CFG.HTTP_PROXY or CFG.USE_SSL or re.search('^'+URI_PREFIX_KS_CHECKSUM, effectiveURI):
# o if we need to go through an outside HTTP proxy, use the
# redirect
# o if an SSL request, use the redirect
@@ -123,7 +124,7 @@ class BrokerHandler(SharedHandler):
self.rhnParent = scheme + \
'://' + \
self.rhnParent + \
- self._getEffectiveURI()
+ effectiveURI)
log_debug(2, 'set self.rhnParent: %s' % self.rhnParent)
log_debug(2, 'set self.rhnParentXMLRPC: %s' % self.rhnParentXMLRPC)
13 years
backend/spacewalk-backend.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 5b825e9e569a147eb4a487d9c021d32558fd95d4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 12 11:06:53 2011 +0200
sgmlop parser could not return data in utf-8
Sgmlop does not have returns_unicode unicode. Or something similar.
For more info see:
https://www.redhat.com/archives/spacewalk-list/2011-May/msg00091.html
addressing:
[Wed May 11 14:56:52 2011] [error] [client 212.219.57.224] PythonHeaderParserHandler spacewalk.server.apacheServer::HeaderParserHandler: File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 64, in __init__\n self.parser._parser.returns_unicode = 0
[Wed May 11 14:40:17 2011] [error] [client 212.219.57.197] PythonHeaderParserHandler spacewalk.server.apacheServer::HeaderParserHandler: AttributeError: SgmlopParser instance has no attribute '_parser'
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 20f914b..0bdfb71 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -84,6 +84,9 @@ Requires: PyPAM
Obsoletes: rhns-server < 5.3.0
Provides: rhns-server = 1:%{version}-%{release}
+#this exists only on rhel5 and rhel6
+Conflicts: python-sgmlop
+
%if 0%{?rhel} && 0%{?rhel} < 6
Requires: mod_python
%else
13 years
proxy/proxy
by Miroslav Suchý
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9c13055ecbaa5d133007d6886987fc6bc5613c72
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 11 17:38:35 2011 +0200
695651 - pass /ty-cksm handler through Broker
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index 8c4c83a..338a3ce 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -23,6 +23,8 @@ WSGIScriptAlias /CONFIG-MANAGEMENT-TOOL /usr/share/rhn/wsgi/xmlrpc.py
# kickstarts via cobbler
WSGIScriptAlias /download /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /ty /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /ty-cksm /usr/share/rhn/wsgi/xmlrpc.py
+
# others
WSGIScriptAlias /SAT /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /SAT-DUMP-INTERNAL /usr/share/rhn/wsgi/xmlrpc.py
13 years
proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 8ba77ac04f0b77a4e6ad6a4810fa353e451a3f3c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 11 17:34:51 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.5-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 14c3ed6..826bd49 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,11 @@ fi
%changelog
+* Wed May 11 2011 Miroslav Suchý 1.5.5-1
+- 695651 - is_virtual is not exposed in mod_wsgi (msuchy(a)redhat.com)
+- 695651 - pass /ty handler through Broker (tlestach(a)redhat.com)
+- 695651 - pass /download handler through Broker (msuchy(a)redhat.com)
+
* Tue May 10 2011 Jan Pazdziora 1.5.4-1
- 678053 - add option --no-session-caching to rhn_package_manager
(msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 2cf9ea5..241b2a9 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.4-1 proxy/proxy/
+1.5.5-1 proxy/proxy/
13 years
Changes to 'refs/tags/spacewalk-proxy-1.5.5-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-11 15:34 +0000
Tagging package [spacewalk-proxy] version [1.5.5-1] in directory [proxy/proxy/].
Changes since spacewalk-setup-1.5.5-1:
Miroslav Suchý (3):
695651 - is_virtual is not exposed in mod_wsgi
695651 - mimic req.connection.local_addr from mod_python
Automatic commit of package [spacewalk-proxy] release [1.5.5-1].
Tomas Lestach (1):
695651 - pass /ty handler through Broker
---
backend/wsgi/wsgiRequest.py | 7 ++++---
proxy/proxy/apacheHandler.py | 10 +---------
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 1 +
proxy/proxy/spacewalk-proxy.spec | 7 ++++++-
rel-eng/packages/spacewalk-proxy | 2 +-
5 files changed, 13 insertions(+), 14 deletions(-)
---
13 years
2 commits - backend/wsgi proxy/proxy
by Miroslav Suchý
backend/wsgi/wsgiRequest.py | 7 ++++---
proxy/proxy/apacheHandler.py | 10 +---------
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 15b32d1fdc2fbd3a6671eef47855b22d2d1f6684
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 11 17:23:13 2011 +0200
695651 - mimic req.connection.local_addr from mod_python
addressing:
[Wed May 11 14:56:49 2011] [error] Traceback (most recent call last):
[Wed May 11 14:56:49 2011] [error] File "/usr/share/rhn/proxy/apacheServer.py", line 66, in __call__
[Wed May 11 14:56:49 2011] [error] ret = f(req)
[Wed May 11 14:56:49 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 105, in headerParserHandler
[Wed May 11 14:56:49 2011] [error] ret = self._transformKickstartRequest(req)
[Wed May 11 14:56:49 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 137, in _transformKickstartRequest
[Wed May 11 14:56:49 2011] [error] return self._transformKickstartRequestForBroker(req)
[Wed May 11 14:56:49 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 149, in _transformKickstartRequestForBroker
[Wed May 11 14:56:49 2011] [error] (status, checksum) = self._querySatelliteForChecksum(req)
[Wed May 11 14:56:49 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 226, in _querySatelliteForChecksum
[Wed May 11 14:56:49 2011] [error] port = req.connection.local_addr[1]
[Wed May 11 14:56:49 2011] [error] AttributeError: WsgiConnection instance has no attribute 'local_addr'
diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py
index fe37d54..d57143a 100644
--- a/backend/wsgi/wsgiRequest.py
+++ b/backend/wsgi/wsgiRequest.py
@@ -29,7 +29,7 @@ class WsgiRequest:
self.start_response = start_response
self.uri = self.unparsed_uri = env['REQUEST_URI']
self.server = WsgiServer(env['SERVER_NAME'], env['SERVER_PORT'])
- self.connection = WsgiConnection(env['REMOTE_ADDR'])
+ self.connection = WsgiConnection(env)
self.options = {}
self.main = 0
self.proto_num = float(env['SERVER_PROTOCOL'].split('/')[1])
@@ -95,8 +95,9 @@ class WsgiServer:
self.port = int(port)
class WsgiConnection:
- def __init__(self, remote_ip):
- self.remote_ip = remote_ip
+ def __init__(self, env):
+ self.remote_ip = env['REMOTE_ADDR']
+ self.local_addr = (env['SERVER_NAME'], env['SERVER_PORT'])
class WsgiMPtable:
""" This class emulates mod_python's mp_table. See
commit 4ac751a7ef3112b3d45fefde183949bb11af2150
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 11 17:07:29 2011 +0200
695651 - is_virtual is not exposed in mod_wsgi
we do not need it anyway. Decission base on req.server.port should be enough
addressing:
[Wed May 11 14:21:31 2011] [error] Traceback (most recent call last):
[Wed May 11 14:21:31 2011] [error] File "/usr/share/rhn/proxy/apacheServer.py", line 66, in __call__
[Wed May 11 14:21:31 2011] [error] ret = f(req)
[Wed May 11 14:21:31 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 105, in headerParserHandler
[Wed May 11 14:21:31 2011] [error] ret = self._transformKickstartRequest(req)
[Wed May 11 14:21:31 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 137, in _transformKickstartRequest
[Wed May 11 14:21:31 2011] [error] return self._transformKickstartRequestForBroker(req)
[Wed May 11 14:21:31 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 149, in _transformKickstartRequestForBroker
[Wed May 11 14:21:31 2011] [error] (status, checksum) = self._querySatelliteForChecksum(req)
[Wed May 11 14:21:31 2011] [error] File "/usr/share/rhn/proxy/apacheHandler.py", line 210, in _querySatelliteForChecksum
[Wed May 11 14:21:31 2011] [error] if req.server.is_virtual and req.server.port == 443:
[Wed May 11 14:21:31 2011] [error] AttributeError: WsgiServer instance has no attribute 'is_virtual'
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 4c358c2..c5a3178 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -202,16 +202,8 @@ class apacheHandler(rhnApache):
is OK, and a checksum is not returned, the old BZ 158236 behavior will
be used.
"""
-
- # There isn't an easy way from within mod_python to definitely
- # determine which scheme was used to contact us, so we'll attempt to
- # use some heuristics. If a virtual server fielded the request and
- # the port number is 443, we can probably assume it's HTTPS. Since
- # we're just making a connection to localhost, it's not the end of the
- # world if we get it wrong.
-
scheme = SCHEME_HTTP
- if req.server.is_virtual and req.server.port == 443:
+ if req.server.port == 443:
scheme = SCHEME_HTTPS
log_debug(6, "Using scheme: %s" % scheme)
13 years
proxy/proxy
by Tomas Lestach
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 9f2255725154d2e2ebc0b7da14a997f5e4893c83
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 11 16:53:14 2011 +0200
695651 - pass /ty handler through Broker
kickstart issue
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index 6484ce2..8c4c83a 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -22,6 +22,7 @@ WSGIScriptAlias /CONFIG-MANAGEMENT /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /CONFIG-MANAGEMENT-TOOL /usr/share/rhn/wsgi/xmlrpc.py
# kickstarts via cobbler
WSGIScriptAlias /download /usr/share/rhn/wsgi/xmlrpc.py
+WSGIScriptAlias /ty /usr/share/rhn/wsgi/xmlrpc.py
# others
WSGIScriptAlias /SAT /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /SAT-DUMP-INTERNAL /usr/share/rhn/wsgi/xmlrpc.py
13 years
Changes to 'refs/tags/spacewalk-setup-1.5.5-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-11 13:52 +0000
Tagging package [spacewalk-setup] version [1.5.5-1] in directory [spacewalk/setup/].
Changes since spacewalk-java-1.5.27-1:
Jan Pazdziora (2):
Actually package the new tomcatX.conf.3 (for the tomcat6 setenv.sh issue) in the rpm.
Automatic commit of package [spacewalk-setup] release [1.5.5-1].
Michael Mraka (1):
703143 - changed (+) to ANSI JOIN
Milan Zazrivec (1):
678721 - errata.cloneAsOriginal API call
Miroslav Suchý (1):
695651 - pass /download handler through Broker
---
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 10 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 76 ++++++++++
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2
rel-eng/packages/spacewalk-setup | 2
spacewalk/setup/spacewalk-setup.spec | 7
5 files changed, 90 insertions(+), 7 deletions(-)
---
13 years
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit cb3c159a860de90610ecbd6f3bb40b713c46e4ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 11 15:52:51 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d6cfb6c..cd5b824 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.4-1 spacewalk/setup/
+1.5.5-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 06f165b..c762e0e 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Wed May 11 2011 Jan Pazdziora 1.5.5-1
+- Actually package the new tomcatX.conf.3 (for the tomcat6 setenv.sh issue) in
+ the rpm.
+
* Wed May 04 2011 Jan Pazdziora 1.5.4-1
- On RHEL 6, tomcat6 no longer sources the setenv.sh so we need to source it
ourselves.
13 years
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/spacewalk-setup.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 497e2fe775dfd5f04d164def4e30a2db51a3e4f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 11 15:52:26 2011 +0200
Actually package the new tomcatX.conf.3 (for the tomcat6 setenv.sh issue) in the rpm.
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index f050900..06f165b 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -63,6 +63,7 @@ install -m 0644 share/ssl.conf.5 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.1 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.2 %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/tomcatX.conf.3 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/web.xml.patch %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
13 years
proxy/proxy
by Miroslav Suchý
proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit d801f7ab02b8e7f37f62b6be70b9a26bacc62df3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 11 15:33:28 2011 +0200
695651 - pass /download handler through Broker
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
index 988096d..6484ce2 100644
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
+++ b/proxy/proxy/httpd-conf/spacewalk-proxy-wsgi.conf
@@ -20,6 +20,8 @@ WSGIScriptAlias /APPLET /usr/share/rhn/wsgi/xmlrpc.py
# rhncfg*
WSGIScriptAlias /CONFIG-MANAGEMENT /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /CONFIG-MANAGEMENT-TOOL /usr/share/rhn/wsgi/xmlrpc.py
+# kickstarts via cobbler
+WSGIScriptAlias /download /usr/share/rhn/wsgi/xmlrpc.py
# others
WSGIScriptAlias /SAT /usr/share/rhn/wsgi/xmlrpc.py
WSGIScriptAlias /SAT-DUMP-INTERNAL /usr/share/rhn/wsgi/xmlrpc.py
13 years
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 645d46cbfc4c8fa217b90378b882357c887dae95
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 11 13:58:14 2011 +0200
703143 - changed (+) to ANSI JOIN
PostgreSQL patch contributed by Julian Einwag
diff --git a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
index f2cea5e..534149b 100644
--- a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
@@ -77,11 +77,11 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Org.accessibleChannels">
<![CDATA[SELECT {c.*}
FROM rhnChannel {c},
- rhnChannelCloned c_1_,
- rhnAvailableChannels cfp
- WHERE c.id = cfp.channel_id AND
- c.id = c_1_.original_id (+) AND
- cfp.org_id = :org_id]]>
+ LEFT JOIN rhnChannelCloned c_1_
+ ON c.id = c_1_.original_id
+ JOIN rhnAvailableChannels cfp
+ ON c.id = cfp.channel_id
+ WHERE cfp.org_id = :org_id]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
<sql-query name="Org.numOfOrgAdmins">
13 years
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 76 ++++++++++
1 file changed, 76 insertions(+)
New commits:
commit 4e0eb25dae25047378066affd966eec0c376390c
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed May 11 12:29:00 2011 +0200
678721 - errata.cloneAsOriginal API call
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index ea2bebe..0e3b0ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -906,6 +906,82 @@ public class ErrataHandler extends BaseHandler {
return toReturn.toArray();
}
+ /**
+ * Clones a list of errata into a specified cloned channel
+ * according the original erratas
+ *
+ * @param sessionKey The sessionKey containing the logged in user
+ * @param channelLabel the cloned channel's label that we are cloning into
+ * @param advisoryNames an array of String objects containing the advisory name
+ * of every errata you want to clone
+ * @throws InvalidChannelRoleException if the user perms are incorrect
+ * @return Returns an array of Errata objects, which get serialized into XMLRPC
+ *
+ * @xmlrpc.doc Clones a list of errata into a specified cloned channel
+ * according the original erratas
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param("string", "channel_label")
+ * @xmlrpc.param
+ * #array_single("string", " advisory - The advisory name of the errata to clone.")
+ * @xmlrpc.returntype
+ * #array()
+ * $ErrataSerializer
+ * #array_end()
+ */
+ public Object[] cloneAsOriginal(String sessionKey, String channelLabel,
+ List advisoryNames) throws InvalidChannelRoleException {
+ User loggedInUser = getLoggedInUser(sessionKey);
+
+ Channel channel = ChannelFactory.lookupByLabelAndUser(channelLabel,
+ loggedInUser);
+
+ if (channel == null) {
+ throw new NoSuchChannelException();
+ }
+
+ if (!channel.isCloned()) {
+ throw new InvalidChannelException("Cloned channel expected: " +
+ channel.getLabel());
+ }
+
+ Channel original = ChannelFactory.lookupOriginalChannel(channel);
+
+ if (original == null) {
+ throw new InvalidChannelException("Cannot access original " +
+ "of the channel: " + channel.getLabel());
+ }
+
+ // check access to the original
+ if (ChannelFactory.lookupByIdAndUser(original.getId(), loggedInUser) == null) {
+ throw new LookupException("User " + loggedInUser.getLogin() +
+ " does not have access to channel " + original.getLabel());
+ }
+
+ if (!UserManager.verifyChannelAdmin(loggedInUser, channel)) {
+ throw new PermissionCheckFailureException();
+ }
+
+ List errataToClone = new ArrayList();
+ List toReturn = new ArrayList();
+
+ //We loop through once, making sure all the errata exist
+ for (Iterator itr = advisoryNames.iterator(); itr.hasNext();) {
+ Errata toClone = lookupErrata((String)itr.next(), loggedInUser.getOrg());
+ errataToClone.add(toClone);
+ }
+ //now that we know its all valid, we clone everything.
+ for (Iterator itr = errataToClone.iterator(); itr.hasNext();) {
+ Errata cloned = ErrataManager.createClone(loggedInUser, (Errata)itr.next());
+ Errata publishedClone = ErrataManager.publish(cloned);
+
+ publishedClone = ErrataFactory.publishToChannel(publishedClone, channel,
+ loggedInUser, true);
+ ErrataFactory.save(publishedClone);
+
+ toReturn.add(publishedClone);
+ }
+ return toReturn.toArray();
+ }
private Object getRequiredAttribute(Map map, String attribute) {
13 years
Changes to 'refs/tags/spacewalk-java-1.5.27-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.27-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-11 09:46 +0000
Tagging package [spacewalk-java] version [1.5.27-1] in directory [java/].
Changes since spacewalk-java-1.5.26-1:
Tomas Lestach (4):
659138 - fix emptykey message
659138 - skip code, if taskomatic is down
659138 - change jsp rendering when taskomatic is down
Automatic commit of package [spacewalk-java] release [1.5.27-1].
---
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 54 +++++-----
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 2
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 44 insertions(+), 32 deletions(-)
---
13 years
4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 54 +++++-----
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 5
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 2
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
6 files changed, 44 insertions(+), 32 deletions(-)
New commits:
commit ee9abbc9d273547de0658d64096029acc54dd5b7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 11 11:46:23 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.27-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3464954..3d2fbd9 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.5.26
+Version: 1.5.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 11 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.27-1
+- 659138 - change jsp rendering when taskomatic is down (tlestach(a)redhat.com)
+- 659138 - skip code, if taskomatic is down (tlestach(a)redhat.com)
+- 659138 - fix emptykey message (tlestach(a)redhat.com)
+
* Tue May 10 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.26-1
- repo generation quick fix (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a60641a..5d545c1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.26-1 java/
+1.5.27-1 java/
commit 9a49f75cb8fb467e5c11aae920d209b56c3288cc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 11 11:45:18 2011 +0200
659138 - change jsp rendering when taskomatic is down
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
index ddac2ff..436e2b4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -76,6 +76,7 @@ public class ScheduleDetailAction extends RhnAction {
}
}
+ prepDropdowns(ctx);
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
@@ -140,7 +141,6 @@ public class ScheduleDetailAction extends RhnAction {
private void setupForm(HttpServletRequest request, DynaActionForm form) {
RequestContext ctx = new RequestContext(request);
User loggedInUser = ctx.getLoggedInUser();
- prepDropdowns(ctx);
Long schid = ctx.getParamAsLong("schid");
if (schid != null) {
@@ -179,8 +179,7 @@ public class ScheduleDetailAction extends RhnAction {
}
}
catch (TaskomaticApiException e) {
- createErrorMessage(ctx.getRequest(),
- "repos.jsp.message.taskomaticdown", null);
+ // do not create error message, it was created before
}
ctx.getRequest().setAttribute("bunches", dropDown);
}
commit cffeafcab7a66f2cceb4423c40e515b9ab8085e3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 11 10:59:00 2011 +0200
659138 - skip code, if taskomatic is down
the patch looks huge, but in fact, only 'if (scheduleName != null) {}' is added
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
index c9f4a7c..9c4af32 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
@@ -59,36 +59,38 @@ public class DeleteScheduleAction extends RhnAction {
"repos.jsp.message.taskomaticdown", null);
}
String scheduleName = (String) schedule.get("job_label");
- String bunchName = (String) schedule.get("bunch");
- request.setAttribute("schedulename", scheduleName);
- request.setAttribute("bunch", bunchName);
- request.setAttribute("cronexpr", schedule.get("cron_expr"));
- request.setAttribute("activetill", schedule.get("active_till"));
- if (isActive(schedule)) {
- if (ctx.isSubmitted()) {
- try {
- tapi.unscheduleSatTask(scheduleName, loggedInUser);
- // there's not a good way to check
- // whether the bunch was unscheduled
- schedule = tapi.lookupScheduleByBunchAndLabel(loggedInUser,
- bunchName, scheduleName);
- if (schedule == null) {
- createSuccessMessage(request, "message.scheduledeleted",
- scheduleName);
+ if (scheduleName != null) {
+ String bunchName = (String) schedule.get("bunch");
+ request.setAttribute("schedulename", scheduleName);
+ request.setAttribute("bunch", bunchName);
+ request.setAttribute("cronexpr", schedule.get("cron_expr"));
+ request.setAttribute("activetill", schedule.get("active_till"));
+ if (isActive(schedule)) {
+ if (ctx.isSubmitted()) {
+ try {
+ tapi.unscheduleSatTask(scheduleName, loggedInUser);
+ // there's not a good way to check
+ // whether the bunch was unscheduled
+ schedule = tapi.lookupScheduleByBunchAndLabel(loggedInUser,
+ bunchName, scheduleName);
+ if (schedule == null) {
+ createSuccessMessage(request, "message.scheduledeleted",
+ scheduleName);
+ }
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"),
+ request.getParameterMap());
}
- return getStrutsDelegate().forwardParams(
- mapping.findForward("success"),
- request.getParameterMap());
- }
- catch (TaskomaticApiException e) {
- createErrorMessage(request,
- "repos.jsp.message.taskomaticdown", null);
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
}
}
- }
- else {
- createErrorMessage(request, "message.schedulenotactive", scheduleName);
+ else {
+ createErrorMessage(request, "message.schedulenotactive", scheduleName);
+ }
}
}
return getStrutsDelegate().forwardParams(
commit cd0f3a9be2c1e05d8530906cd735a8f35d68ad0d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 11 10:49:26 2011 +0200
659138 - fix emptykey message
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 1a3de55..14f72b9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -22819,6 +22819,12 @@ given channel.</source>
<context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedule.jsp.noruns">
+ <source>There're no runs available.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
<source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 3e5b704..12296a9 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -38,7 +38,7 @@
</div>
<br/>
<rl:list
- emptykey="assignedgroups.jsp.nogroups"
+ emptykey="schedule.jsp.noruns"
dataset="dataset" >
<rl:decorator name="PageSizeDecorator"/>
13 years
Changes to 'refs/tags/spacewalk-java-1.5.26-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.26-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-10 17:56 +0000
Tagging package [spacewalk-java] version [1.5.26-1] in directory [java/].
Changes since spacewalk-selinux-1.5.3-1:
Tomas Lestach (2):
repo generation quick fix
Automatic commit of package [spacewalk-java] release [1.5.26-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 4 +++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
13 years
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 4 +++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 9841bf70e262444cdadf135eeb352a0f9a84d02d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 10 19:56:19 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.26-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 932f58d..3464954 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.5.25
+Version: 1.5.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 10 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.26-1
+- repo generation quick fix (tlestach(a)redhat.com)
+
* Tue May 10 2011 Jan Pazdziora 1.5.25-1
- 678519 - moving MOTD into a separate kickstart snippent
(mario(a)mediatronix.de)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fe2db38..a60641a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.25-1 java/
+1.5.26-1 java/
commit add7a4ff3646d1a2165eaeca0db08bc5f5d4e979
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 10 19:10:36 2011 +0200
repo generation quick fix
errata with no bug summary fail whole repogeneration
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
index adf640b..bb12e43 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
@@ -229,7 +229,9 @@ public class UpdateInfoWriter extends RepomdWriter {
attr.addAttribute("id", Long.toString(bug.getId()));
attr.addAttribute("type", "bugzilla");
handler.startElement("reference", attr);
- handler.addCharacters(bug.getSummary());
+ if (bug.getSummary() != null) {
+ handler.addCharacters(bug.getSummary());
+ }
handler.endElement("reference");
}
13 years
Changes to 'refs/tags/spacewalk-selinux-1.5.3-1'
by Jan Pazdziora
Tag 'spacewalk-selinux-1.5.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 14:58 +0000
Tagging package [spacewalk-selinux] version [1.5.3-1] in directory [selinux/spacewalk-selinux/].
Changes since spacewalk-java-1.5.25-1:
Jan Pazdziora (2):
702274 - fixing unconfined_u error.
Automatic commit of package [spacewalk-selinux] release [1.5.3-1].
---
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
selinux/spacewalk-selinux/spacewalk.fc | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years
rel-eng/packages selinux/spacewalk-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e1d263b5728733e113191793295590630ea6c855
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 16:58:13 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.5.3-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 0da3cf8..6a00b0e 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.5.2-1 selinux/spacewalk-selinux/
+1.5.3-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 4ced6a4..68bfa49 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk
Name: spacewalk-selinux
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.3-1
+- 702274 - fixing unconfined_u error.
+
* Tue May 10 2011 Jan Pazdziora 1.5.2-1
- 634989 - allow Apache to send emails, useful when mod_python/mod_perl is
about to send traceback.
13 years
selinux/spacewalk-selinux
by Jan Pazdziora
selinux/spacewalk-selinux/spacewalk.fc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5df365a25f7a344b31fb8f24ed4a43a1db177516
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 16:57:36 2011 +0200
702274 - fixing unconfined_u error.
Addressing
libsepol.context_from_record: user unconfined_u is not defined
libsepol.context_from_record: could not create context structure
libsepol.context_from_string: could not create context structure
libsepol.sepol_context_to_sid: could not convert unconfined_u:object_r:spacewalk_data_t:s0 to sid
on RHEL 5.
diff --git a/selinux/spacewalk-selinux/spacewalk.fc b/selinux/spacewalk-selinux/spacewalk.fc
index 574e07f..fbc8166 100644
--- a/selinux/spacewalk-selinux/spacewalk.fc
+++ b/selinux/spacewalk-selinux/spacewalk.fc
@@ -23,4 +23,4 @@
/usr/sbin/tanukiwrapper gen_context(system_u:object_r:java_exec_t,s0)
-/var/lib/rhn/kickstarts(/.*)? gen_context(unconfined_u:object_r:spacewalk_data_t,s0)
+/var/lib/rhn/kickstarts(/.*)? gen_context(system_u:object_r:spacewalk_data_t,s0)
13 years
Changes to 'refs/tags/spacewalk-java-1.5.25-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.25-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 14:17 +0000
Tagging package [spacewalk-java] version [1.5.25-1] in directory [java/].
Changes since rhncfg-5.10.5-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.25-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit e4ec908678785eb748c075d464d1aa84060fd165
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 16:17:15 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.25-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 59477ac..932f58d 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.5.24
+Version: 1.5.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.25-1
+- 678519 - moving MOTD into a separate kickstart snippent
+ (mario(a)mediatronix.de)
+
* Tue May 10 2011 Jan Pazdziora 1.5.24-1
- 638571 - set correctly the Channels column (tlestach(a)redhat.com)
- 636614 - mark system_groups of org.listOrgs API as optional
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a1ed7c6..fe2db38 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.24-1 java/
+1.5.25-1 java/
13 years
Changes to 'refs/tags/rhncfg-5.10.5-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 14:16 +0000
Tagging package [rhncfg] version [5.10.5-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-branding-1.5.1-1:
Ionuț Arțăriși (2):
fix usage documentation messages for topdir and dest-file
remove unused import, fix indentation and a minor typo
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.10.5-1].
---
client/tools/rhncfg/config_management/rhncfg_diff.py | 13 ++++++-------
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
---
13 years
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit af9930cf76affd6a4c894489928d61cebf7ab50f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 16:16:30 2011 +0200
Automatic commit of package [rhncfg] release [5.10.5-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index f256cb8..20c3e9b 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.4
+Version: 5.10.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -104,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 10 2011 Jan Pazdziora 5.10.5-1
+- remove unused import, fix indentation and a minor typo (iartarisi(a)suse.cz)
+- fix usage documentation messages for topdir and dest-file (iartarisi(a)suse.cz)
+
* Fri May 06 2011 Jan Pazdziora 5.10.4-1
- 702524 - Fixed python traceback when deploying a file with permission set to
000 (mmello(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 96ad96e..f6cfede 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.4-1 client/tools/rhncfg/
+5.10.5-1 client/tools/rhncfg/
13 years
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_management/rhncfg_diff.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit b94fc4267c5d6ceb95eaf0e24c65431645444f8d
Author: Ionuț Arțăriși <iartarisi(a)suse.cz>
Date: Tue May 10 14:56:39 2011 +0200
remove unused import, fix indentation and a minor typo
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 759279c..72a0dd1 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -21,7 +21,6 @@ import sys
from config_common import handler_base, utils, cfg_exceptions
from config_common.rhn_log import log_debug, die
-from config_common.file_utils import diff
from spacewalk.common.fileutils import f_date, ostr_to_sym
@@ -121,14 +120,14 @@ class Handler(handler_base.HandlerBase):
if info['encoding'] == 'base64':
info['file_contents'] = base64.decodestring(info['file_contents'])
else:
- die(9, 'Error: unknow encoding %s' % info['encoding'])
+ die(9, 'Error: unknown encoding %s' % info['encoding'])
except cfg_exceptions.RepositoryFileMissingError:
die(2, "Error: no such file %s (revision %s) in config channel %s"
% (path, revision, channel))
if os.path.islink(local_file) and info['filetype'] != 'symlink' :
- die(8, "Cannot diff %s; the file on the system is a symbolic link while the file in the channel is not. " % local_file)
+ die(8, "Cannot diff %s; the file on the system is a symbolic link while the file in the channel is not. " % local_file)
if info['filetype'] == 'symlink' and not os.path.islink(local_file) :
- die(8, "Cannot diff %s; the file on the system is not a symbolic link while the file in the channel is. " % local_file)
+ die(8, "Cannot diff %s; the file on the system is not a symbolic link while the file in the channel is. " % local_file)
if info['filetype'] == 'symlink':
src_link = info['symlink']
dest_link = os.readlink(local_file)
@@ -152,7 +151,7 @@ class Handler(handler_base.HandlerBase):
if 'selinux_ctx' not in info:
info['selinux_ctx'] = ''
if not first_row and not self.__attributes_differ(info, local_info):
- return ""
+ return ""
else:
template = "--- %s\t%s\tattributes: %s %s %s %s\tconfig channel: %s\trevision: %s"
if not info.has_key('modified'):
13 years
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_management/rhncfg_diff.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 65e23a5b030c5cb43d80376f372389882bba6f60
Author: Ionuț Arțăriși <iartarisi(a)suse.cz>
Date: Tue May 10 14:55:51 2011 +0200
fix usage documentation messages for topdir and dest-file
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index d497ff0..759279c 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -38,11 +38,11 @@ class Handler(handler_base.HandlerBase):
),
handler_base.HandlerBase._option_class(
'-d', '--dest-file', action="store",
- help="Upload the file as this path",
+ help="Remote file to compare to",
),
handler_base.HandlerBase._option_class(
'-t', '--topdir', action="store",
- help="Make all files relative to this string",
+ help="Directory to which all file paths are relative",
),
]
def run(self):
13 years
Changes to 'refs/tags/spacewalk-branding-1.5.1-1'
by Jan Pazdziora
Tag 'spacewalk-branding-1.5.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 13:44 +0000
Tagging package [spacewalk-branding] version [1.5.1-1] in directory [branding/].
Changes since spacewalk-java-1.5.24-1:
Jan Pazdziora (2):
484895 - Point the release notes dispatcher to fedorahosted.org.
Automatic commit of package [spacewalk-branding] release [1.5.1-1].
Mario Schugowski (1):
678519 - moving MOTD into a separate kickstart snippent
---
branding/conf/rhn_docs.conf | 6 +-----
branding/spacewalk-branding.spec | 5 ++++-
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 8 ++------
java/conf/cobbler/snippets/default_motd | 2 ++
java/spacewalk-java.spec | 2 ++
rel-eng/packages/spacewalk-branding | 2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
---
13 years
branding/spacewalk-branding.spec rel-eng/packages
by Jan Pazdziora
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0efa45978e12318250f4861962ece750d899f232
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 15:44:30 2011 +0200
Automatic commit of package [spacewalk-branding] release [1.5.1-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index cdc1c54..0013fe3 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.1-1
+- 484895 - Point the release notes dispatcher to fedorahosted.org.
+
* Wed Mar 30 2011 Jan Pazdziora 1.4.3-1
- update copyright years (msuchy(a)redhat.com)
- implement common access keys (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 4fb6653..92a0c48 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.4.3-1 branding/
+1.5.1-1 branding/
13 years
java/code java/conf java/spacewalk-java.spec
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 8 ++------
java/conf/cobbler/snippets/default_motd | 2 ++
java/spacewalk-java.spec | 2 ++
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f47ed24770fe7e2d8dc5fd3393b6c7faddc269c9
Author: Mario Schugowski <mario(a)mediatronix.de>
Date: Thu Mar 3 10:46:25 2011 +0100
678519 - moving MOTD into a separate kickstart snippent
drawback: /etc/motd doesn't contain product name any more
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index b261c92..0aa0f75 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -63,6 +63,7 @@ public class KickstartFormatter {
private static final String POST_DELETION_SNIPPET =
"spacewalk/post_delete_system";
private static final String KEEP_SYSTEM_ID_SNIPPET = "spacewalk/keep_system_id";
+ private static final String DEFAULT_MOTD = "spacewalk/default_motd";
private static final String RAW_START = "#raw";
private static final String RAW_END = "#end raw";
@@ -79,11 +80,6 @@ public class KickstartFormatter {
Config.get().getString("web.product_name") + " Config Management" +
NEWLINE;
private static final String COMMENT = "#" + NEWLINE;
- private static final String MOTD_FOOTER = "# MOTD" + NEWLINE + "echo >> /etc/motd" +
- NEWLINE + "echo \"" + Config.get().getString("web.product_name") +
- " kickstart on \\$(date +'%Y-%m-%d')\" >> /etc/motd" +
- NEWLINE + "echo >> /etc/motd" + NEWLINE + NEWLINE +
- "# end of generated kickstart file";
private static final String BEGINRHN = "%post --logfile " +
"/root/ks-rhn-post.log" + NEWLINE +
"# --Begin " + Config.get().getString("web.product_name") +
@@ -266,7 +262,6 @@ public class KickstartFormatter {
buf.append(NEWLINE);
addCobblerSnippet(buf, "post_install_kernel_options");
addCobblerSnippet(buf, "koan_environment");
- buf.append(MOTD_FOOTER);
buf.append(NEWLINE);
buf.append("$kickstart_done");
buf.append(NEWLINE);
@@ -677,6 +672,7 @@ public class KickstartFormatter {
retval.append("/etc/init.d/haldaemon restart" + NEWLINE);
}
retval.append("# begin cobbler snippet" + NEWLINE);
+ addCobblerSnippet(retval, DEFAULT_MOTD);
addCobblerSnippet(retval, REDHAT_REGISTER_SNIPPET);
retval.append("# end cobbler snippet" + NEWLINE);
diff --git a/java/conf/cobbler/snippets/default_motd b/java/conf/cobbler/snippets/default_motd
new file mode 100644
index 0000000..4f2b77b
--- /dev/null
+++ b/java/conf/cobbler/snippets/default_motd
@@ -0,0 +1,2 @@
+# set default MOTD
+echo "Kickstarted on \$(date +'%Y-%m-%d')" >> /etc/motd
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b0cd73b..59477ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -345,6 +345,7 @@ install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_initrddir}
install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT%{_datadir}/rhn/lib
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT%{_datadir}/rhn/classes/log4j.properties
+install -m 644 conf/cobbler/snippets/default_motd $RPM_BUILD_ROOT%{cobdirsnippets}/default_motd
install -m 644 conf/cobbler/snippets/keep_system_id $RPM_BUILD_ROOT%{cobdirsnippets}/keep_system_id
install -m 644 conf/cobbler/snippets/post_reactivation_key $RPM_BUILD_ROOT%{cobdirsnippets}/post_reactivation_key
install -m 644 conf/cobbler/snippets/post_delete_system $RPM_BUILD_ROOT%{cobdirsnippets}/post_delete_system
@@ -497,6 +498,7 @@ fi
%dir %{cobprofdirup}
%dir %{cobprofdirwiz}
%dir %{cobdirsnippets}
+%config %{cobdirsnippets}/default_motd
%config %{cobdirsnippets}/keep_system_id
%config %{cobdirsnippets}/post_reactivation_key
%config %{cobdirsnippets}/post_delete_system
13 years
Changes to 'refs/tags/spacewalk-java-1.5.24-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:35 +0000
Tagging package [spacewalk-java] version [1.5.24-1] in directory [java/].
Changes since spacewalk-proxy-1.5.4-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.24-1].
---
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit f8035159b720a8b00faebdf06e84762d231d2dc7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:35:20 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5159d88..b0cd73b 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.5.23
+Version: 1.5.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.24-1
+- 638571 - set correctly the Channels column (tlestach(a)redhat.com)
+- 636614 - mark system_groups of org.listOrgs API as optional
+ (tlestach(a)redhat.com)
+- 636614 - fix system_groups for org.listOrgs API (tlestach(a)redhat.com)
+- 703064 - changing WebUI message (tlestach(a)redhat.com)
+- 659138 - fix button submit detection (tlestach(a)redhat.com)
+- 659138 - schedule description strings update (tlestach(a)redhat.com)
+
* Mon May 09 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.23-1
- 659138 - change runs ordering (tlestach(a)redhat.com)
- 659138 - first schedule, then display (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 55922a3..a1ed7c6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.23-1 java/
+1.5.24-1 java/
13 years
Changes to 'refs/tags/spacewalk-proxy-1.5.4-1'
by Jan Pazdziora
Tag 'spacewalk-proxy-1.5.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-proxy] version [1.5.4-1] in directory [proxy/proxy/].
Changes since spacewalk-web-1.5.8-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-proxy] release [1.5.4-1].
---
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years
proxy/proxy rel-eng/packages
by Jan Pazdziora
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 19faf70ecf4b6772c022f01dec677367c3df638e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:56 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index b969419..14c3ed6 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.4-1
+- 678053 - add option --no-session-caching to rhn_package_manager
+ (msuchy(a)redhat.com)
+
* Wed May 04 2011 Miroslav Suchý 1.5.3-1
- do not import modules through magic
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index eb19afc..2cf9ea5 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.3-1 proxy/proxy/
+1.5.4-1 proxy/proxy/
13 years
Changes to 'refs/tags/spacewalk-web-1.5.8-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-web] version [1.5.8-1] in directory [web/].
Changes since spacewalk-selinux-1.5.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.8-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years
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 3686623550ffb98a1d307e75a45c83b2b4437c70
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:33 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 7968d4d..67d3476 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.7-1 web/
+1.5.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 266ce85..32230ef 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.7
+Version: 1.5.8
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
+* Tue May 10 2011 Jan Pazdziora 1.5.8-1
+- Fix remote command schedule date on postgresql (Ville.Salmela(a)csc.fi)
+
* Fri May 06 2011 Jan Pazdziora 1.5.7-1
- Fix remote commands on Spacewalk 1.4 and PostgreSQL (Ville.Salmela(a)csc.fi)
13 years
Changes to 'refs/tags/spacewalk-selinux-1.5.2-1'
by Jan Pazdziora
Tag 'spacewalk-selinux-1.5.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-10 11:34 +0000
Tagging package [spacewalk-selinux] version [1.5.2-1] in directory [selinux/spacewalk-selinux/].
Changes since spacewalk-selinux-1.5.1-1:
Jan Pazdziora (2):
634989 - allow Apache to send emails, useful when mod_python/mod_perl is about to send traceback.
Automatic commit of package [spacewalk-selinux] release [1.5.2-1].
---
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux-enable | 1 +
selinux/spacewalk-selinux/spacewalk-selinux.spec | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years
rel-eng/packages selinux/spacewalk-selinux
by Jan Pazdziora
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 437100c8f476bd6bfd8b3c975dd346aae63d0f5a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:34:05 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.5.2-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 4067a17..0da3cf8 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.5.1-1 selinux/spacewalk-selinux/
+1.5.2-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index ab84164..4ced6a4 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk
Name: spacewalk-selinux
-Version: 1.5.1
+Version: 1.5.2
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,10 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Tue May 10 2011 Jan Pazdziora 1.5.2-1
+- 634989 - allow Apache to send emails, useful when mod_python/mod_perl is
+ about to send traceback.
+
* Tue May 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.1-1
- 702274 - restore kickstart files context
- 702274 - fixed context of kickstart configs
13 years
selinux/spacewalk-selinux
by Jan Pazdziora
selinux/spacewalk-selinux/spacewalk-selinux-enable | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 87e7077f0a2923763ef5ce9ec5de6e3aa7533467
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 10 13:31:06 2011 +0200
634989 - allow Apache to send emails, useful when mod_python/mod_perl is about to send traceback.
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable
index 88db671..7693b65 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux-enable
+++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable
@@ -48,6 +48,7 @@ for selinuxvariant in mls strict targeted
/usr/sbin/setsebool -P httpd_enable_cgi 1
/usr/sbin/setsebool -P httpd_can_network_connect 1
+/usr/sbin/setsebool -P httpd_can_sendmail 1
if [ -z "$RUN_PURE" ] ; then
for dir in mount_point kickstart_mount_point; do
13 years
Changes to 'refs/tags/spacewalk-selinux-1.5.1-1'
by Michael Mraka
Tag 'spacewalk-selinux-1.5.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-10 09:39 +0000
Tagging package [spacewalk-selinux] version [1.5.1-1] in directory [selinux/spacewalk-selinux/].
Changes since spacewalk-backend-1.5.19-1:
Michael Mraka (4):
702274 - allow cobblerd_t to read spacewalk_data_t
702274 - fixed context of kickstart configs
702274 - restore kickstart files context
Automatic commit of package [spacewalk-selinux] release [1.5.1-1].
Tomas Lestach (3):
636614 - fix system_groups for org.listOrgs API
636614 - mark system_groups of org.listOrgs API as optional
638571 - set correctly the Channels column
Ville Salmela (1):
Fix remote command schedule date on postgresql
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 1 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 4 ++--
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 4 +++-
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux-enable | 3 ++-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 7 ++++++-
selinux/spacewalk-selinux/spacewalk.fc | 2 ++
selinux/spacewalk-selinux/spacewalk.te | 10 ++++++++++
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
10 files changed, 30 insertions(+), 8 deletions(-)
---
13 years
rel-eng/packages selinux/spacewalk-selinux
by Michael Mraka
rel-eng/packages/spacewalk-selinux | 2 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 5acc76a3795d27391a5c787eae0037d5689fb33a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 10 11:39:22 2011 +0200
Automatic commit of package [spacewalk-selinux] release [1.5.1-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux
index 7cf3eb6..4067a17 100644
--- a/rel-eng/packages/spacewalk-selinux
+++ b/rel-eng/packages/spacewalk-selinux
@@ -1 +1 @@
-1.4.1-1 selinux/spacewalk-selinux/
+1.5.1-1 selinux/spacewalk-selinux/
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index 43f3985..ab84164 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -7,7 +7,7 @@
%define modulename spacewalk
Name: spacewalk-selinux
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: SELinux policy module supporting Spacewalk Server
@@ -113,6 +113,11 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Tue May 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.1-1
+- 702274 - restore kickstart files context
+- 702274 - fixed context of kickstart configs
+- 702274 - allow cobblerd_t to read spacewalk_data_t
+
* Thu Mar 03 2011 Jan Pazdziora 1.4.1-1
- Apache should not be able to read the rpm database.
13 years
3 commits - selinux/spacewalk-selinux
by Michael Mraka
selinux/spacewalk-selinux/spacewalk-selinux-enable | 3 ++-
selinux/spacewalk-selinux/spacewalk.fc | 2 ++
selinux/spacewalk-selinux/spacewalk.te | 10 ++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit c7030d3f79f5ee4a77900b455bcdd79313865129
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 10 10:28:58 2011 +0200
702274 - restore kickstart files context
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable
index 7b529a6..88db671 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux-enable
+++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable
@@ -43,7 +43,8 @@ for selinuxvariant in mls strict targeted
done
/sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
- /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert /var/www/html/pub /usr/sbin/tanukiwrapper
+ /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert /var/www/html/pub /usr/sbin/tanukiwrapper \
+ /var/lib/rhn/kickstarts
/usr/sbin/setsebool -P httpd_enable_cgi 1
/usr/sbin/setsebool -P httpd_can_network_connect 1
commit 67aa9aadb05d3875c483fc926aa5e80c4fc5ae55
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 9 16:28:20 2011 +0200
702274 - fixed context of kickstart configs
diff --git a/selinux/spacewalk-selinux/spacewalk.fc b/selinux/spacewalk-selinux/spacewalk.fc
index 61c7598..574e07f 100644
--- a/selinux/spacewalk-selinux/spacewalk.fc
+++ b/selinux/spacewalk-selinux/spacewalk.fc
@@ -22,3 +22,5 @@
/var/log/spacewalk/schema-upgrade(/.*)? gen_context(user_u:object_r:spacewalk_db_install_log_t,s0)
/usr/sbin/tanukiwrapper gen_context(system_u:object_r:java_exec_t,s0)
+
+/var/lib/rhn/kickstarts(/.*)? gen_context(unconfined_u:object_r:spacewalk_data_t,s0)
commit 121140517b765134eeb56caff84fdbb88247ccf3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 9 16:22:38 2011 +0200
702274 - allow cobblerd_t to read spacewalk_data_t
diff --git a/selinux/spacewalk-selinux/spacewalk.te b/selinux/spacewalk-selinux/spacewalk.te
index f62b454..ed1932b 100644
--- a/selinux/spacewalk-selinux/spacewalk.te
+++ b/selinux/spacewalk-selinux/spacewalk.te
@@ -81,6 +81,16 @@ optional_policy(`
allow oracle_sqlplus_t spacewalk_db_install_log_t:file append;
')
+optional_policy(`
+ gen_require(`
+ type cobblerd_t;
+ type httpd_cobbler_content_t;
+ ')
+ read_files_pattern(cobblerd_t, spacewalk_data_t, spacewalk_data_t);
+ allow cobblerd_t spacewalk_data_t:file { getattr link unlink rename };
+ manage_dirs_pattern(cobblerd_t, spacewalk_data_t, spacewalk_data_t);
+')
+
# rpm_dontaudit_search_db(httpd_t) is not available on RHELs
dontaudit httpd_t rpm_var_lib_t:dir list_dir_perms;
dontaudit httpd_t rpm_var_lib_t:file read_file_perms;
13 years
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 266e5277fdb7de141d374b7dad906711a4f93720
Author: Ville Salmela <Ville.Salmela(a)csc.fi>
Date: Tue May 10 09:48:37 2011 +0200
Fix remote command schedule date on postgresql
With this patch the scheduled command has an accurate date
" 5/10/11 10:28:00 AM EEST " instead of "5/10/11 12:00:00 AM EEST"
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 2ee15e4..d494047 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -108,7 +108,7 @@ EOQ
# TODO: fix sys_date => reasonable value later...
my $query = <<EOQ;
INSERT INTO rhnAction (id, org_id, action_type, scheduler, earliest_action, version, name, prerequisite)
-VALUES (?, ?, ?, ?, TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'), 2, ?, ?)
+VALUES (?, ?, ?, ?, TO_TIMESTAMP(?, 'YYYY-MM-DD HH24:MI:SS'), 2, ?, ?)
EOQ
$sth = $dbh->prepare($query);
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 1 +
java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 775406e2197909660919110c6a4da0f79b558bce
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 29 13:52:27 2010 +0200
638571 - set correctly the Channels column
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index a3f9ee6..b0c3599 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1728,6 +1728,7 @@ SELECT distinct P.id AS ID,
CP.channel_id = :cid
</query>
<elaborator name="package_details" />
+ <elaborator name="package_channels" />
</mode>
<!-- Runs the cache cleanup for all packages in an RhnSet. The package ID must be in
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
index ab18c79..d5fa40e 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java
@@ -988,7 +988,9 @@ public class PackageManager extends BaseManager {
"Package_queries", "custom_package_in_channel");
DataResult dr = m.execute(params);
- dr.setElaborationParams(new HashMap());
+ Map elabs = new HashMap();
+ elabs.put("org_id", orgId);
+ dr.setElaborationParams(elabs);
return dr;
}
13 years
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6fe1d9dc054285307e58bbb24d0e59f27a3a441e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 9 16:53:12 2011 +0200
636614 - mark system_groups of org.listOrgs API as optional
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
index a88e6c6..e2fbcbb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
@@ -37,7 +37,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("int", "systems", "Number of systems in the organization.")
* #prop_desc("int", "trusts", "Number of trusted organizations.")
* #prop_desc("int", "system_groups",
- * "Number of system groups in the organization.")
+ * "Number of system groups in the organization. (optional)")
* #prop_desc("int", "activation_keys",
* "Number of activation keys in the organization. (optional)")
* #prop_desc("int", "kickstart_profiles",
commit 6c58252e57bf420c3333fe8205bbdd2e5e257e0d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 27 12:41:13 2010 +0200
636614 - fix system_groups for org.listOrgs API
we returned wrong value since the beginning of time
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
index 3789f39..92ed6fb 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
@@ -41,7 +41,8 @@ SELECT
wc.name,
(SELECT COUNT(ru.id) FROM rhnuser ru WHERE ru.org_id = wc.id) users,
(SELECT COUNT(s.id) FROM rhnServer s WHERE s.org_id = wc.id) systems,
- (SELECT COUNT(*) FROM rhnTrustedOrgs t WHERE t.org_id = wc.id) trusts
+ (SELECT COUNT(*) FROM rhnTrustedOrgs t WHERE t.org_id = wc.id) trusts,
+ (SELECT COUNT(*) FROM rhnServerGroup g WHERE g.org_id = wc.id AND g.group_type IS NULL) server_groups
FROM web_customer wc
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
index 8d751d2..a88e6c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgDtoSerializer.java
@@ -72,7 +72,7 @@ public class OrgDtoSerializer implements XmlRpcCustomSerializer {
add(helper, "systems", dto.getSystems());
add(helper, "trusts", dto.getTrusts());
add(helper, "activation_keys", dto.getActivationKeys());
- add(helper, "system_groups", dto.getActivationKeys());
+ add(helper, "system_groups", dto.getServerGroups());
add(helper, "kickstart_profiles", dto.getKickstartProfiles());
add(helper, "configuration_channels", dto.getConfigChannels());
helper.writeTo(output);
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.19-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-09 14:52 +0000
Tagging package [spacewalk-backend] version [1.5.19-1] in directory [backend/].
Changes since spacewalk-backend-1.5.18-1:
Jan Brázdil (1):
rhn-satellite-exporter with start-date and end-date
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.5.19-1].
Miroslav Suchý (1):
fix utf-8 in emails
Tomas Lestach (1):
703064 - changing WebUI message
---
backend/common/rhnMail.py | 6 -
backend/satellite_tools/disk_dumper/iss.py | 44 +++++-----
backend/satellite_tools/exporter/exportLib.py | 24 ++---
backend/spacewalk-backend.spec | 6 +
java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
rel-eng/packages/spacewalk-backend | 2
7 files changed, 47 insertions(+), 40 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 12558590388ee5f81c751f429e7da0db07233d1d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 9 16:52:31 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 815d192..20f914b 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.18
+Version: 1.5.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 09 2011 Jan Pazdziora 1.5.19-1
+- rhn-satellite-exporter with start-date and end-date (jbrazdil(a)redhat.com)
+- fix utf-8 in emails (msuchy(a)redhat.com)
+
* Mon May 09 2011 Jan Pazdziora 1.5.18-1
- fix satsync with older spacewalk versions not providing weak deps
(mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 98767b2..83f1371 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.18-1 backend/
+1.5.19-1 backend/
13 years
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/disk_dumper/iss.py | 44 +++++++++++++-------------
backend/satellite_tools/exporter/exportLib.py | 24 +++++++-------
2 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit e1a225a62b3034709d20ea87b9f7e767ad6ee105
Author: Jan Brázdil <jbrazdil(a)redhat.com>
Date: Mon May 9 16:49:37 2011 +0200
rhn-satellite-exporter with start-date and end-date
This patch fix problem in rhn-satellite-exporter on PostgreSQL:
When we are trying to export dump with options --start-date and/or
--end-date with PostgreSQL backend these dates have only day precision, but
with Oracle backend they have second precision.
On PostgreSQL DATE is represented as day only and the time information is
striped. We want to represent these dates as TIMESTAMP so we can preserve
time and have second precision.
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 3240204..0fc5b86 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -250,13 +250,13 @@ class Dumper(dumper.XML_Dumper):
if self.start_date:
if self.use_rhn_date:
query += """
- and rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- and rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
self.brpm_query = rhnSQL.Statement(query)
brpm_data = rhnSQL.prepare(self.brpm_query)
@@ -287,13 +287,13 @@ class Dumper(dumper.XML_Dumper):
if self.start_date:
if self.use_rhn_date:
query += """
- and rp.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and rp.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- and rcp.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and rcp.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
self.package_query = rhnSQL.Statement(query)
package_data = rhnSQL.prepare(self.package_query)
@@ -328,13 +328,13 @@ class Dumper(dumper.XML_Dumper):
if self.start_date:
if self.use_rhn_date:
query += """
- where ps.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and ps.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ where ps.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and ps.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- where ps.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and ps.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ where ps.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and ps.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
self.source_package_query = rhnSQL.Statement(query)
source_package_data = rhnSQL.prepare(self.source_package_query)
@@ -366,13 +366,13 @@ class Dumper(dumper.XML_Dumper):
if self.start_date:
if self.use_rhn_date:
query += """
- and e.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and e.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and e.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and e.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
else:
query += """
- and ce.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and ce.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and ce.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and ce.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
self.errata_query = rhnSQL.Statement(query)
errata_data = rhnSQL.prepare(self.errata_query)
@@ -403,14 +403,14 @@ class Dumper(dumper.XML_Dumper):
if self.start_date:
if self.use_rhn_date:
query += """
- and kt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and kt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and kt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and kt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
and kt.org_id is Null
"""
else:
query += """
- and kt.modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and kt.modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and kt.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and kt.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
and kt.org_id is Null
"""
self.kickstart_trees_query = rhnSQL.Statement(query)
@@ -447,8 +447,8 @@ class Dumper(dumper.XML_Dumper):
"""
if self.start_date:
query += """
- and rkt.last_modified >= TO_DATE(:start_date, 'YYYYMMDDHH24MISS')
- and rkt.last_modified <= TO_DATE(:end_date, 'YYYYMMDDHH24MISS')
+ and rkt.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS')
+ and rkt.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')
"""
self.kickstart_files_query = rhnSQL.Statement(query)
kickstart_files = rhnSQL.prepare(self.kickstart_files_query)
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index 928d077..597c4c7 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -311,8 +311,8 @@ class _ChannelDumper(BaseRowDumper):
select package_id as id
from rhnChannelPackage rcp
where rcp.channel_id = :channel_id
- and rcp.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS')
- and rcp.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS')
+ and rcp.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and rcp.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""")
_query_get_package_ids_by_rhndate_limits = rhnSQL.Statement("""
@@ -320,8 +320,8 @@ class _ChannelDumper(BaseRowDumper):
from rhnPackage rp, rhnChannelPackage rcp
where rcp.channel_id = :channel_id
and rcp.package_id = rp.id
- and rp.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS')
- and rp.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS')
+ and rp.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and rp.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""")
@@ -375,14 +375,14 @@ class _ChannelDumper(BaseRowDumper):
_query__get_errata_ids_by_limits = rhnSQL.Statement("""
%s
- and ce.modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS')
- and ce.modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS')
+ and ce.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and ce.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""" % _query__get_errata_ids)
_query__get_errata_ids_by_rhnlimits = rhnSQL.Statement("""
%s
- and e.last_modified >= TO_Date(:lower_limit, 'YYYYMMDDHH24MISS')
- and e.last_modified <= TO_Date(:upper_limit, 'YYYYMMDDHH24MISS')
+ and e.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and e.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""" % _query__get_errata_ids)
def _get_errata_ids(self):
@@ -399,14 +399,14 @@ class _ChannelDumper(BaseRowDumper):
_query_get_kickstartable_trees_by_rhnlimits = rhnSQL.Statement("""
%s
- and kt.last_modified >= TO_DATE(:lower_limit, 'YYYYMMDDHH24MISS')
- and kt.last_modified <= TO_DATE(:upper_limit, 'YYYYMMDDHH24MISS')
+ and kt.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and kt.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""" % _query_get_kickstartable_trees)
_query_get_kickstartable_trees_by_limits = rhnSQL.Statement("""
%s
- and kt.modified >= TO_DATE(:lower_limit, 'YYYYMMDDHH24MISS')
- and kt.modified <= TO_DATE(:upper_limit, 'YYYYMMDDHH24MISS')
+ and kt.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS')
+ and kt.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')
""" % _query_get_kickstartable_trees)
def _get_kickstartable_trees(self):
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 8848000a9342ccacb1555cee45db466ca86141a5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 9 16:30:07 2011 +0200
703064 - changing WebUI message
due to a cobbler selinux issue, cobbler sync fails even if cobbler is available
the webui error message was beside the point
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
index 8971a43..7d33e17 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java
@@ -202,7 +202,7 @@ public class CreateProfileWizardAction extends RhnWizardAction {
vType, ctx.getLoggedInUser());
if (distro == null) {
ValidatorException.raiseException(
- "kickstart.cobbler.profile.invalidvirt");
+ "kickstart.cobbler.profile.nodistribution");
}
if (form.get(DEFAULT_DOWNLOAD_PARAM) == null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index abac563..ce19863 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8675,6 +8675,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="kickstart.cobbler.profile.invalidvirt">
<source>Para-Virtualization is unsupported with the selected kickstart tree or distribution.</source>
</trans-unit>
+ <trans-unit id="kickstart.cobbler.profile.nodistribution">
+ <source>Selected kickstartable tree isn't available at the moment. Please check cobbler functionality.</source>
+ </trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidtreeforvirt">
<source>You have selected a distribution or kickstart tree that is incompatible with the currently selected virtualization type. Please either select a different distribution, or change the selected Virtualization Type of this profile before trying to set the distribution.</source>
</trans-unit>
13 years
backend/common
by Miroslav Suchý
backend/common/rhnMail.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 42eb5654b42a77443d23381689a2d8822ae4a987
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri May 6 10:01:48 2011 +0200
fix utf-8 in emails
addressing:
Traceback (most recent call last):
File "/usr/bin/satellite-sync", line 176, in ?
systemExit_exception(7, "SYNC ERROR: attempting to display as much information as possible:", e)
File "/usr/bin/satellite-sync", line 126, in systemExit_exception
satsync.sendMail(forceEmail=1)
File "/usr/lib/python2.4/site-packages/spacewalk/satellite_tools/satsync.py", line 362, in sendMail
rhnMail.send(headers, body, sender=sndr)
File "/usr/lib/python2.4/site-packages/spacewalk/common/rhnMail.py", line 58, in send
msg = "%s\n%s\n" % (joined_headers, body)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 114: ordinal not in range(128)
diff --git a/backend/common/rhnMail.py b/backend/common/rhnMail.py
index b96e2b9..93964bb 100644
--- a/backend/common/rhnMail.py
+++ b/backend/common/rhnMail.py
@@ -50,11 +50,11 @@ def send(headers, body, sender = None, lazy = 0):
(headers, toaddrs) = __check_headers(headers)
if sender is None:
sender = headers["From"]
- joined_headers = ''
+ joined_headers = u''
for h in headers.keys():
- joined_headers += "%s: %s\n" % (h, headers[h].encode('utf-8'))
+ joined_headers += u"%s: %s\n" % (h, headers[h])
server = smtplib.SMTP('localhost')
- msg = "%s\n%s\n" % (joined_headers, body)
+ msg = u"%s\n%s\n" % (joined_headers, body)
server.sendmail(sender, toaddrs, msg.encode('utf-8'))
server.quit()
13 years
Changes to 'refs/tags/spacewalk-backend-1.5.18-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-09 13:45 +0000
Tagging package [spacewalk-backend] version [1.5.18-1] in directory [backend/].
Changes since spacewalk-java-1.5.23-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.5.18-1].
Michael Calmer (1):
fix satsync with older spacewalk versions not providing weak deps
Tomas Lestach (2):
659138 - schedule description strings update
659138 - fix button submit detection
---
backend/server/importlib/packageImport.py | 6 ++++
backend/spacewalk-backend.spec | 6 +++-
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 13 ++++++++++
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 9 ++++++
rel-eng/packages/spacewalk-backend | 2 -
6 files changed, 34 insertions(+), 4 deletions(-)
---
13 years
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit b043be5a872241f7280d035d3ee6d4cac2d807cf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 9 15:45:49 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.18-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e0d398e..815d192 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.17
+Version: 1.5.18
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 09 2011 Jan Pazdziora 1.5.18-1
+- fix satsync with older spacewalk versions not providing weak deps
+ (mc(a)suse.de)
+
* Mon May 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.17-1
- only one package per NVREA can be in channel, unlink the old one first
- link package also when the checksum has changed
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index af7e1f2..98767b2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.17-1 backend/
+1.5.18-1 backend/
13 years
backend/server
by mcalmer
backend/server/importlib/packageImport.py | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 5bb5805a5f2effb1ee4f876dedc0fe4b40177dfe
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 7 20:00:22 2011 +0200
fix satsync with older spacewalk versions not providing weak deps
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index d46b6d4..c03db36 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -219,6 +219,12 @@ class PackageImport(ChannelPackageSubscription):
# XXX
package['copyright'] = package['license']
+ for tag in ('recommends', 'suggests', 'supplements'):
+ if type(package[tag]) != type([]):
+ # older spacewalk server do not export weak deps.
+ # lets create an empty list
+ package[tag] = []
+
# Creates all the data structures needed to insert capabilities
for tag in ('provides', 'requires', 'conflicts', 'obsoletes', 'recommends', 'suggests', 'supplements'):
depList = package[tag]
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7b5c763a65939e87095177ab0a27da080c0dc2f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 9 14:10:06 2011 +0200
659138 - fix button submit detection
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
index 89475e7..6b2c005 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -59,7 +59,7 @@ public class BunchDetailAction extends RhnAction implements Listable {
request.setAttribute("bunchdescription", LocalizationService.getInstance().
getMessage("bunch.jsp.description." + bunchLabel));
- if (ctx.isSubmitted()) {
+ if (ctx.wasDispatched("bunch.edit.jsp.button-schedule")) {
try {
Date date = new TaskomaticApi().scheduleSingleSatBunch(loggedInUser,
bunchLabel);
13 years
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 13 ++++++++++
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 9 ++++++
2 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 8562d871fc097dc8616683197fc184f50778c4a5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 9 11:40:52 2011 +0200
659138 - schedule description strings update
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 5eee44c..1a3de55 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -22819,6 +22819,12 @@ given channel.</source>
<context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedules.jsp.introparagraph">
+ <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="schedule.edit.jsp.introparagraph">
<source>You can set a schedule of the selected bunch here.</source>
<context-group name="ctx">
@@ -22849,6 +22855,13 @@ given channel.</source>
<context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="schedule.edit.jsp.satschedules">
+ <source>@@PRODUCT_NAME@@ Schedules</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="schedule.edit.jsp.basicscheduledetails">
<source>Basic Schedule Details</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 1ea7ddf..6f70a45 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -15,11 +15,18 @@
creationType="schedule"
creationAcl="user_role(satellite_admin)"
helpUrl="">
- <bean:message key="task.status.title"/>
+ <bean:message key="schedule.edit.jsp.satschedules"/>
</rhn:toolbar>
<rl:listset name="scheduleList">
+ <h2><bean:message key="schedule.edit.jsp.satschedules"/></h2>
+ <div class="page-summary">
+ <bean:message key="schedules.jsp.introparagraph"/>
+ </div>
+
+ <br/>
+
<rl:list
emptykey="schedule.jsp.noschedules">
13 years
Changes to 'refs/tags/spacewalk-java-1.5.23-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.23-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-09 09:14 +0000
Tagging package [spacewalk-java] version [1.5.23-1] in directory [java/].
Changes since spacewalk-backend-1.5.17-1:
Tomas Lestach (7):
659138 - reinit for possible single task schedules
659138 - fix scheduling of single runs for specific time
659138 - display times in current timezone
659138 - update single run action message
659138 - first schedule, then display
659138 - change runs ordering
Automatic commit of package [spacewalk-java] release [1.5.23-1].
---
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 21 ++++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java | 5 --
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java | 8 +++
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 6 ++
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 7 ++-
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 3 -
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 3 -
java/spacewalk-java.spec | 11 ++++-
rel-eng/packages/spacewalk-java | 2
11 files changed, 51 insertions(+), 19 deletions(-)
---
13 years
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 8f3604a228613f9434105d8801e946120b23f2ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 9 11:14:44 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.23-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7b56382..5159d88 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.5.22
+Version: 1.5.23
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 09 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.23-1
+- 659138 - change runs ordering (tlestach(a)redhat.com)
+- 659138 - first schedule, then display (tlestach(a)redhat.com)
+- 659138 - update single run action message (tlestach(a)redhat.com)
+- 659138 - display times in current timezone (tlestach(a)redhat.com)
+- 659138 - fix scheduling of single runs for specific time
+ (tlestach(a)redhat.com)
+- 659138 - reinit for possible single task schedules (tlestach(a)redhat.com)
+
* Fri May 06 2011 Jan Pazdziora 1.5.22-1
- 673392 - correct entitlement count logic for custom channels
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9c3dbf9..55922a3 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.22-1 java/
+1.5.23-1 java/
13 years
6 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 21 ++++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java | 5 --
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java | 8 +++
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 6 ++
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 7 ++-
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 3 -
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 3 -
9 files changed, 40 insertions(+), 17 deletions(-)
New commits:
commit c24eb1255b64166095a76825afa483ee7a16e39c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:33:08 2011 +0200
659138 - change runs ordering
not sure, what is better
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
index 5459391..e1c2888 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
@@ -42,7 +42,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<query name="TaskoRun.listByBunch">
- <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name = :bunch_name ORDER BY startTime DESC, template.ordering DESC, endTime DESC]]>
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name = :bunch_name ORDER BY startTime DESC, id DESC]]>
</query>
<query name="TaskoRun.listRunsWithStatus">
commit 488d4180232ee5d2fa180b923ab86f60416135fa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:31:20 2011 +0200
659138 - first schedule, then display
comsmetic issue - more user friendly
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
index 27b1e2d..89475e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -58,10 +58,6 @@ public class BunchDetailAction extends RhnAction implements Listable {
request.setAttribute("label", bunchLabel);
request.setAttribute("bunchdescription", LocalizationService.getInstance().
getMessage("bunch.jsp.description." + bunchLabel));
- ListHelper helper = new ListHelper(this, request);
- helper.setListName(LIST_NAME);
- helper.setParentUrl(request.getRequestURI() + "?label=" + bunchLabel);
- helper.execute();
if (ctx.isSubmitted()) {
try {
@@ -78,7 +74,10 @@ public class BunchDetailAction extends RhnAction implements Listable {
"repos.jsp.message.taskomaticdown", null);
}
}
-
+ ListHelper helper = new ListHelper(this, request);
+ helper.setListName(LIST_NAME);
+ helper.setParentUrl(request.getRequestURI() + "?label=" + bunchLabel);
+ helper.execute();
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
commit eed3e5c9fa86b834b0b88cc096731c232b4fb2a6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:17:57 2011 +0200
659138 - update single run action message
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
index 2bf580e..27b1e2d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -27,8 +27,11 @@ import com.redhat.rhn.taskomatic.TaskomaticApiException;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -62,8 +65,13 @@ public class BunchDetailAction extends RhnAction implements Listable {
if (ctx.isSubmitted()) {
try {
- new TaskomaticApi().scheduleSingleSatBunch(loggedInUser, bunchLabel);
- createSuccessMessage(request, "message.bunch.singlescheduled", bunchLabel);
+ Date date = new TaskomaticApi().scheduleSingleSatBunch(loggedInUser,
+ bunchLabel);
+ ActionMessages msgs = new ActionMessages();
+ msgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("message.bunch.singlescheduled", bunchLabel,
+ LocalizationService.getInstance().formatCustomDate(date)));
+ saveMessages(request, msgs);
}
catch (TaskomaticApiException e) {
createErrorMessage(request,
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index bafe513..abac563 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8655,7 +8655,7 @@ Follow this url to see the full list of inactive systems:
<source>Per-User subscription restrictions may be applied in the Subscribers tab</source>
</trans-unit>
<trans-unit id="message.bunch.singlescheduled">
- <source>Single run of <strong>{0}</strong> bunch was scheduled.</source>
+ <source>Single run of <strong>{0}</strong> bunch was scheduled for {1}.</source>
</trans-unit>
<trans-unit id="message.schedulecreated">
<source>Schedule <strong>{0}</strong> created.</source>
commit c657393b9d13bf855eb8950d1e618941c5a2c9b7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:16:57 2011 +0200
659138 - display times in current timezone
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 8ceb73c..3e5b704 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -3,6 +3,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:xhtml/>
<html>
@@ -52,13 +53,15 @@
<rl:column bound="false"
headerkey="task.edit.jsp.stattime"
sortattr="start_time" >
- <a href="/rhn/admin/ScheduleDetail.do?schid=${current.schedule_id}">${current.start_time}</a>
+ <a href="/rhn/admin/ScheduleDetail.do?schid=${current.schedule_id}">
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${current.start_time}"/>
+ </a>
</rl:column>
<rl:column bound="false"
headerkey="task.edit.jsp.endtime"
sortattr="end_time" >
- <c:out value="${current.end_time}" />
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${current.end_time}"/>
</rl:column>
<rl:column bound="false"
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index 2aa6ffe..bcf226e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -2,6 +2,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html>
<body>
@@ -92,7 +93,7 @@
<bean:message key="schedule.edit.jsp.activetill"/>:
</th>
<td class="small-form">
- <c:out value="${activetill}"/>
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${activetill}"/>
</td>
</tr>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 976a815..1ea7ddf 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -3,6 +3,7 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<html:xhtml/>
<html>
@@ -42,7 +43,7 @@
bound="false"
headerkey="schedule.edit.jsp.activefrom"
sortattr="active_from" >
- <c:out value="${current.active_from}" />
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z" value="${current.active_from}"/>
</rl:column>
<rl:column bound="false"
commit 38c7ca120d5fc655b91525335aacd3236a4970c0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 23:07:41 2011 +0200
659138 - fix scheduling of single runs for specific time
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
index 899d105..85b92bf 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
@@ -68,15 +68,12 @@ public class TaskoQuartzHelper {
if (isCronExpressionEmpty(schedule.getCronExpr())) {
trigger = new SimpleTrigger(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()), 1, 1);
- trigger.setEndTime(new Date());
}
else {
try {
trigger = new CronTrigger(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()),
schedule.getCronExpr());
- trigger.setStartTime(schedule.getActiveFrom());
- trigger.setEndTime(schedule.getActiveTill());
}
catch (ParseException e) {
throw new InvalidParamException("Invalid cron expression " +
@@ -84,6 +81,8 @@ public class TaskoQuartzHelper {
}
}
+ trigger.setStartTime(schedule.getActiveFrom());
+ trigger.setEndTime(schedule.getActiveTill());
// create job
JobDetail jobDetail = new JobDetail(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()), TaskoJob.class);
commit 14c180f1ce0723b765dba618de8e58517594d2a3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 22:01:29 2011 +0200
659138 - reinit for possible single task schedules
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
index 7b7781f..ee595e7 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
@@ -295,4 +295,12 @@ public class TaskoSchedule {
public void setCronExpr(String cronExprIn) {
cronExpr = cronExprIn;
}
+
+ /**
+ * checks whether cron expression is defined
+ * @return true, if it's a cron schedule
+ */
+ public boolean isCronSchedule() {
+ return (cronExpr != null) && !cronExpr.isEmpty();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
index fbeb506..2be64cb 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
@@ -499,7 +499,11 @@ public class TaskoXmlRpcHandler {
List<TaskoSchedule> schedules = new ArrayList<TaskoSchedule>();
for (TaskoSchedule schedule : TaskoFactory.listFuture()) {
TaskoQuartzHelper.destroyJob(schedule.getOrgId(), schedule.getJobLabel());
- schedule.setActiveFrom(new Date());
+ Date now = new Date();
+ schedule.setActiveFrom(now);
+ if (!schedule.isCronSchedule()) {
+ schedule.setActiveTill(now);
+ }
TaskoFactory.save(schedule);
try {
TaskoQuartzHelper.createJob(schedule);
13 years