Changes to 'refs/tags/spacewalk-backend-1.5.17-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.17-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-09 08:08 +0000
Tagging package [spacewalk-backend] version [1.5.17-1] in directory [backend/].
Changes since spacewalk-web-1.5.7-1:
Michael Mraka (3):
link package also when the checksum has changed
only one package per NVREA can be in channel, unlink the old one first
Automatic commit of package [spacewalk-backend] release [1.5.17-1].
---
backend/satellite_tools/reposync.py | 44 +++++++++++++++++++++++-------------
backend/server/rhnPackage.py | 15 +++++++++---
backend/spacewalk-backend.spec | 6 ++++
rel-eng/packages/spacewalk-backend | 2 -
4 files changed, 46 insertions(+), 21 deletions(-)
---
13 years, 1 month
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 7e6e567221d297a59c5cff3b9b83308c8bb0c68c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 9 10:08:14 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index bbfd386..e0d398e 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.16
+Version: 1.5.17
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 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
+
* Thu May 05 2011 Miroslav Suchý 1.5.16-1
- 683200 - send emails as utf-8
- 683200 - convert hostname in subject from pune to unicode
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3484b0e..af7e1f2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.16-1 backend/
+1.5.17-1 backend/
13 years, 1 month
2 commits - backend/satellite_tools backend/server
by Michael Mraka
backend/satellite_tools/reposync.py | 44 +++++++++++++++++++++++-------------
backend/server/rhnPackage.py | 15 +++++++++---
2 files changed, 40 insertions(+), 19 deletions(-)
New commits:
commit f023f614b0c308bbcd85e1159f88517d2a2cd4ba
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 6 14:36:44 2011 +0200
only one package per NVREA can be in channel, unlink the old one first
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 260c48f..6834adb 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -312,21 +312,24 @@ class RepoSync:
to_process = []
self.print_msg("Repo " + url + " has " + str(len(packages)) + " packages.")
for pack in packages:
- path, package_channel = rhnPackage.get_path_for_package(
+ db_pack = rhnPackage.get_info_for_package(
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
self.channel_label)
to_download = True
to_link = True
- if path:
- pack.path = os.path.join(CFG.MOUNT_POINT, path)
+ if db_pack['path']:
+ pack.path = os.path.join(CFG.MOUNT_POINT, db_pack['path'])
if self.match_package_checksum(pack.path,
pack.checksum_type, pack.checksum):
# package is already on disk
to_download = False
- if package_channel == self.channel_label:
+ if db_pack['channel_label'] == self.channel_label:
# package is already in the channel
to_link = False
+ elif db_pack['channel_label'] == self.channel_label:
+ # different package with SAME NVREA
+ self.disassociate_package(db_pack)
if to_download or to_link:
to_process.append((pack, to_download, to_link))
@@ -406,6 +409,21 @@ class RepoSync:
backend.commit()
+ def disassociate_package(self, pack):
+ h = rhnSQL.prepare("""
+ delete from rhnChannelPackage cp
+ where cp.channel_id = :channel_id
+ and cp.package_id in (select p.id
+ from rhnPackage p
+ join rhnChecksumView c
+ on p.checksum_id = c.id
+ where c.checksum = :checksum
+ and c.checksum_type = :checksum_type
+ )
+ """)
+ h.execute(channel_id=self.channel['id'],
+ checksum_type=pack['checksum_type'], checksum=pack['checksum'])
+
def _importer_run(self, package, caller, backend):
importer = ChannelPackageSubscription(
[IncompletePackage().populate(package)],
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index 0d68348..f4366d3 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -280,7 +280,7 @@ def get_source_package_path_by_name(server_id, packageName):
rhnFlags.set("Download-Accelerator-Path", rs['path'])
return filePath
-def get_path_for_package(pkg, channel_label):
+def get_info_for_package(pkg, channel_label):
log_debug(3, pkg)
pkg = map(str, pkg)
params = {'name': pkg[0],
@@ -295,7 +295,8 @@ def get_path_for_package(pkg, channel_label):
else:
epochStatement = "epoch = :epoch"
statement = """
- select p.path, c.label as channel_label
+ select p.path, c.label as channel_label,
+ cv.checksum_type, cv.checksum
from rhnPackage p
join rhnPackageName pn
on p.name_id = pn.id
@@ -309,6 +310,8 @@ def get_path_for_package(pkg, channel_label):
on cp.channel_id = c.id
and p.org_id = c.org_id
and c.label = :label
+ join rhnChecksumView cv
+ on p.checksum_id = cv.id
where pn.name = :name
and pe.version = :ver
and pe.release = :rel
@@ -321,8 +324,12 @@ def get_path_for_package(pkg, channel_label):
ret = h.fetchone_dict()
if not ret:
- return None, None
- return ret['path'], ret['channel_label']
+ return {'path': None,
+ 'channel_label': None,
+ 'checksum_type': None,
+ 'checksum': None,
+ }
+ return ret
def _none2emptyString(foo):
commit 34ec2c39ceb38a523cb1d81b87d8394e920c85e6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 6 11:46:57 2011 +0200
link package also when the checksum has changed
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 3fd3ebe..260c48f 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -316,21 +316,17 @@ class RepoSync:
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
self.channel_label)
- to_download = False
- to_link = False
- if not path:
- # package is not on disk
- to_download = True
- else:
- # a different package is on disk
+ to_download = True
+ to_link = True
+ if path:
pack.path = os.path.join(CFG.MOUNT_POINT, path)
- if not self.match_package_checksum(pack.path,
+ if self.match_package_checksum(pack.path,
pack.checksum_type, pack.checksum):
- to_download = True
-
- if package_channel != self.channel_label:
- # package is not in the channel
- to_link = True
+ # package is already on disk
+ to_download = False
+ if package_channel == self.channel_label:
+ # package is already in the channel
+ to_link = False
if to_download or to_link:
to_process.append((pack, to_download, to_link))
13 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.5.7-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:36 +0000
Tagging package [spacewalk-web] version [1.5.7-1] in directory [web/].
Changes since spacewalk-java-1.5.22-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.7-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 1 month
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 dcd452fd981e1acf2f5a35fea086631dc2721182
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:36:23 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.7-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c52b2e9..7968d4d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.6-1 web/
+1.5.7-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4de311b..266ce85 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.6
+Version: 1.5.7
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
+* Fri May 06 2011 Jan Pazdziora 1.5.7-1
+- Fix remote commands on Spacewalk 1.4 and PostgreSQL (Ville.Salmela(a)csc.fi)
+
* Thu May 05 2011 Miroslav Suchý 1.5.6-1
- 682112 - correct column name (mzazrivec(a)redhat.com)
- 682112 - correct displayed systems consuming channel entitlements
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.22-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.5.22-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:36 +0000
Tagging package [spacewalk-java] version [1.5.22-1] in directory [java/].
Changes since rhncfg-5.10.4-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.5.22-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 1 month
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 ed7d26a83f71555727ac7dbfb5bc921d428ffdb0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:36:00 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.22-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0f62b44..7b56382 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.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
@@ -538,6 +538,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 06 2011 Jan Pazdziora 1.5.22-1
+- 673392 - correct entitlement count logic for custom channels
+ (mzazrivec(a)redhat.com)
+
* Thu May 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.21-1
- 659138 - fix ordering of runs (tlestach(a)redhat.com)
- introduce taskomatic reinit schedules (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dc57725..9c3dbf9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.21-1 java/
+1.5.22-1 java/
13 years, 1 month
Changes to 'refs/tags/rhncfg-5.10.4-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-06 18:35 +0000
Tagging package [rhncfg] version [5.10.4-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.5.21-1:
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.10.4-1].
Marcelo Moreira de Mello (1):
702524 - Fixed python traceback when deploying a file with permission set to 000
Milan Zazrivec (1):
673392 - correct entitlement count logic for custom channels
Ville Salmela (1):
Fix remote commands on Spacewalk 1.4 and PostgreSQL
---
client/tools/rhncfg/config_common/transactions.py | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 6 +++++-
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 14 ++++++++++++--
rel-eng/packages/rhncfg | 2 +-
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
5 files changed, 23 insertions(+), 6 deletions(-)
---
13 years, 1 month
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 7a835bafcf38515f52ac46b5492956442d718ce1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri May 6 20:35:33 2011 +0200
Automatic commit of package [rhncfg] release [5.10.4-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index bf30f7a..f256cb8 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.3
+Version: 5.10.4
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
+* 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)
+
* Fri Apr 29 2011 Jan Pazdziora 5.10.3-1
- 699966 - added --ignore-missing option in rhncfg-manager to ignore missing
local files when adding or uploading files (mmello(a)redhat.com)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 3955ea97..96ad96e 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.3-1 client/tools/rhncfg/
+5.10.4-1 client/tools/rhncfg/
13 years, 1 month
client/tools
by Jan Pazdziora
client/tools/rhncfg/config_common/transactions.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit bbc13b8e49e78dbe463b4aaa495a5b9ecef9bc81
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Fri May 6 11:26:21 2011 -0300
702524 - Fixed python traceback when deploying a file with permission set to 000
diff --git a/client/tools/rhncfg/config_common/transactions.py b/client/tools/rhncfg/config_common/transactions.py
index de7a459..44ffc60 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -144,7 +144,10 @@ class DeployTransaction:
mode = '600'
if file_info.has_key('filemode'):
- mode = file_info['filemode']
+ if file_info['filemode'] is "":
+ mode='000'
+ else:
+ mode = file_info['filemode']
mode = string.atoi(str(mode), 8)
os.chmod(temp_file_path, mode)
13 years, 1 month
java/code
by Milan Zazrivec
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 32b333cb2021979f55b0796502e1aa6ac0e21245
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri May 6 12:32:29 2011 +0200
673392 - correct entitlement count logic for custom channels
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 45426a2..1e07d52 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -59,12 +59,22 @@
</c:when>
<c:otherwise>
- (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ <c:if test="${channel.availableSubscriptions == null}">
+ (<bean:message key="sdc.channels.edit.unlimited"/>)
+ </c:if>
+ <c:if test="${channel.availableSubscriptions != null}">
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ </c:if>
</c:otherwise>
</c:choose>
</c:if>
<c:if test="${not system.virtualGuest}">
- (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ <c:if test="${channel.availableSubscriptions == null}">
+ (<bean:message key="sdc.channels.edit.unlimited"/>)
+ </c:if>
+ <c:if test="${channel.availableSubscriptions != null}">
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ </c:if>
</c:if>
</li>
</c:forEach>
13 years, 1 month
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ebe752c01faa2e685e82bf6b59567a682d6ee30
Author: Ville Salmela <Ville.Salmela(a)csc.fi>
Date: Fri May 6 11:42:21 2011 +0200
Fix remote commands on Spacewalk 1.4 and PostgreSQL
Addressing
Execution of /var/www/html/network/systems/ssm/provisioning/remote_command_conf.pxt failed at Fri Apr 29 15:05:05 2011:
RHN::Exception: DBD::Pg::st execute failed: ERROR: column "action_id" is of type numeric but expression is of type text at character 82
HINT: You will need to rewrite or cast the expression.
RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 228 RHN::Exception::DB::throw
RHN::DB::st /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 564
RHN::DB::handle_error
RHN::DB::Scheduler /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB/Scheduler.pm 1530 RHN::DB::st::execute_h
Sniglets::ListView::SystemList /usr/lib/perl5/vendor_perl/5.8.8/Sniglets/ListView/SystemList.pm 385 RHN::DB::Scheduler::schedule_remote_command
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 75a2ba2..2ee15e4 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -1511,7 +1511,7 @@ sub schedule_remote_command {
# can't use the normal add_systems for the set...
$sth = $dbh->prepare(<<EOQ);
INSERT INTO rhnServerAction (server_id, action_id, status)
-SELECT DISTINCT S.id, :action_id, :status
+SELECT DISTINCT S.id, :action_id + 0, :status + 0
FROM rhnServer S,
rhnClientCapabilityName CCN,
rhnClientCapability CC,
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.21-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.21-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-05 18:58 +0000
Tagging package [spacewalk-java] version [1.5.21-1] in directory [java/].
Changes since spacewalk-web-1.5.6-1:
Tomas Lestach (3):
introduce taskomatic reinit schedules
659138 - fix ordering of runs
Automatic commit of package [spacewalk-java] release [1.5.21-1].
---
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 12 ++++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml | 4 +
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 25 ++++++++++
java/spacewalk-java.spec | 6 ++
rel-eng/packages/spacewalk-java | 2
6 files changed, 48 insertions(+), 3 deletions(-)
---
13 years, 1 month
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 93a59d0cade4076043a2edaae801ebf46f1ccf10
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 20:58:18 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.21-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 82441c9..0f62b44 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.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
@@ -538,6 +538,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.21-1
+- 659138 - fix ordering of runs (tlestach(a)redhat.com)
+- introduce taskomatic reinit schedules (tlestach(a)redhat.com)
+
* Wed May 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.20-1
- 648640 - keep fineGrained option when changing number of custom items
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 833c6b1..dc57725 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.20-1 java/
+1.5.21-1 java/
13 years, 1 month
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 12 ++++
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml | 4 +
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 25 ++++++++++
4 files changed, 42 insertions(+), 1 deletion(-)
New commits:
commit e8733b8eace4ce61c3d207ffddf1d8ce394e2f7c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 19:56:20 2011 +0200
659138 - fix ordering of runs
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 3da3c70..5459391 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, endTime DESC]]>
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name = :bunch_name ORDER BY startTime DESC, template.ordering DESC, endTime DESC]]>
</query>
<query name="TaskoRun.listRunsWithStatus">
commit efdfafc349cec29f4ed448f0403d2553b8b2a2a5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 18:01:09 2011 +0200
introduce taskomatic reinit schedules
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
index 5686900..4d0b09d 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
@@ -293,6 +293,18 @@ public class TaskoFactory extends HibernateFactory {
}
}
+
+ /**
+ * list schedules, that shall be run sometime in the future
+ * @return list of schedules to be run at least once
+ */
+ public static List<TaskoSchedule> listFuture() {
+ Map params = new HashMap();
+ params.put("timestamp", new Date());
+ return singleton.listObjectsByNamedQuery(
+ "TaskoSchedule.listFuture", params);
+ }
+
private static TaskoBunch lookupBunchByOrgAndName(Integer orgId, String bunchName)
throws NoSuchBunchTaskException {
TaskoBunch bunch = null;
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
index 30375d8..d06aa75 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
@@ -80,6 +80,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE orgId = :org_id AND (activeFrom < :timestamp AND (activeTill is null OR :timestamp < activeTill))]]>
</query>
+ <query name="TaskoSchedule.listFuture">
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE activeTill is null OR :timestamp < activeTill]]>
+ </query>
+
<query name="TaskoSchedule.listActiveInSat">
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE orgId is null AND activeFrom < :timestamp AND (activeTill is null OR :timestamp < activeTill)]]>
</query>
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
index 46776e0..fbeb506 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.taskomatic.core.SchedulerKernel;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -487,4 +488,28 @@ public class TaskoXmlRpcHandler {
throws InvalidParamException {
return getRunStdErrorLog(null, runId, nBytes);
}
+
+ /**
+ * reinitialize all schedules
+ * meant to be called, when taskomatic has to be reinitialized
+ * (f.e. because of time shift)
+ * @return list of successfully reinitialized schedules
+ */
+ public List<TaskoSchedule> reinitializeAllSchedulesFromNow() {
+ List<TaskoSchedule> schedules = new ArrayList<TaskoSchedule>();
+ for (TaskoSchedule schedule : TaskoFactory.listFuture()) {
+ TaskoQuartzHelper.destroyJob(schedule.getOrgId(), schedule.getJobLabel());
+ schedule.setActiveFrom(new Date());
+ TaskoFactory.save(schedule);
+ try {
+ TaskoQuartzHelper.createJob(schedule);
+ schedules.add(schedule);
+ }
+ catch (InvalidParamException e) {
+ // Pech gehabt()
+ }
+ }
+ return schedules;
+
+ }
}
13 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.5.6-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-05 15:51 +0000
Tagging package [spacewalk-web] version [1.5.6-1] in directory [web/].
Changes since spacewalk-backend-1.5.16-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-web] release [1.5.6-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.5.16-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.5.16-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-05 15:51 +0000
Tagging package [spacewalk-backend] version [1.5.16-1] in directory [backend/].
Changes since rhnpush-5.5.27-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-backend] release [1.5.16-1].
---
backend/spacewalk-backend.spec | 9 ++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
13 years, 1 month
Changes to 'refs/tags/rhnpush-5.5.27-1'
by Miroslav Suchý
Tag 'rhnpush-5.5.27-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-05 15:51 +0000
Tagging package [rhnpush] version [5.5.27-1] in directory [client/tools/rhnpush/].
Changes since spacewalk-search-1.5.1-1:
Milan Zazrivec (1):
682112 - correct column name
Miroslav Suchý (7):
do not test if rhnParent can handle session caching
678053 - add option --no-session-caching to rhn_package_manager
provide estimation about remaining time for downloading rpm
localize satsync messages
683200 - convert hostname in subject from pune to unicode
683200 - send emails as utf-8
Automatic commit of package [rhnpush] release [5.5.27-1].
---
backend/common/rhnMail.py | 10 +-
backend/satellite_tools/messages.py | 68 ++++++++-------
backend/satellite_tools/satsync.py | 43 +++++++++
backend/server/handlers/app/packages.py | 5 -
client/tools/rhnpush/rhnpush.py | 2
client/tools/rhnpush/rhnpush.sgml | 2
client/tools/rhnpush/rhnpush.spec | 5 -
client/tools/rhnpush/uploadLib.py | 18 +--
proxy/proxy/pm/rhn_package_manager.py | 2
proxy/proxy/pm/rhn_package_manager.sgml | 6 +
rel-eng/packages/rhnpush | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 4
12 files changed, 113 insertions(+), 54 deletions(-)
---
13 years, 1 month
3 commits - backend/spacewalk-backend.spec client/tools rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
backend/spacewalk-backend.spec | 9 ++++++++-
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
6 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit b03e75d9ae549d98d932b80b99a8bf8fbfb47f22
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 17:51:52 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.6-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c26a373..c52b2e9 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.5-1 web/
+1.5.6-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index bc01a03..4de311b 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.5
+Version: 1.5.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu May 05 2011 Miroslav Suchý 1.5.6-1
+- 682112 - correct column name (mzazrivec(a)redhat.com)
+- 682112 - correct displayed systems consuming channel entitlements
+ (mzazrivec(a)redhat.com)
+
* Mon May 02 2011 Jan Pazdziora 1.5.5-1
- Fixing set_err invocation to match the prototype.
commit 56b08de1ae944e5508e4b0d151bf0990973476da
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 17:51:34 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index b9a11b3..bbfd386 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.15
+Version: 1.5.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,13 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu May 05 2011 Miroslav Suchý 1.5.16-1
+- 683200 - send emails as utf-8
+- 683200 - convert hostname in subject from pune to unicode
+- localize satsync messages
+- provide estimation about remaining time for downloading rpm
+- do not test if rhnParent can handle session caching
+
* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.15-1
- some wierd packages have files in iso8859-1 not utf-8
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3c16d99..3484b0e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.15-1 backend/
+1.5.16-1 backend/
commit 1aa139e34ce0e8ca9b43d09c73c7d54403da4267
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 17:51:06 2011 +0200
Automatic commit of package [rhnpush] release [5.5.27-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 50bf286..79ef84c 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.26
+Version: 5.5.27
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Thu May 05 2011 Miroslav Suchý 5.5.27-1
+- do not test if rhnParent can handle session caching
+
* Fri Apr 15 2011 Jan Pazdziora 5.5.26-1
- build rhnpush on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index e7be0a5..346b7ec 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.26-1 client/tools/rhnpush/
+5.5.27-1 client/tools/rhnpush/
13 years, 1 month
web/modules
by Milan Zazrivec
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 51306522f122e9470755f200f577f4539a4e66f1
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu May 5 15:32:36 2011 +0200
682112 - correct column name
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 7a581d1..f9715da 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -910,7 +910,7 @@ SELECT distinct S.id, S.name
WHERE S.org_id = :org_id
AND S.id = SC.server_id
AND SC.channel_id = CFM.channel_id
- AND SC.is_flex = 'N'
+ AND SC.is_fve = 'N'
AND CFM.channel_family_id = :cfam_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
@@ -928,7 +928,7 @@ SELECT distinct S.id, S.name
WHERE S.org_id = :org_id
AND S.id = SC.server_id
AND SC.channel_id = CFM.channel_id
- AND SC.is_flex = 'Y'
+ AND SC.is_fve = 'Y'
AND CFM.channel_family_id = :cfam_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
13 years, 1 month
4 commits - backend/common backend/satellite_tools
by Miroslav Suchý
backend/common/rhnMail.py | 10 +++--
backend/satellite_tools/messages.py | 68 +++++++++++++++++++-----------------
backend/satellite_tools/satsync.py | 43 +++++++++++++++++++++-
3 files changed, 85 insertions(+), 36 deletions(-)
New commits:
commit 88a9273544879bb86db5cea5dc4288cb2c41bb08
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 11:47:15 2011 +0200
683200 - send emails as utf-8
diff --git a/backend/common/rhnMail.py b/backend/common/rhnMail.py
index f7aaa60..b96e2b9 100644
--- a/backend/common/rhnMail.py
+++ b/backend/common/rhnMail.py
@@ -22,6 +22,7 @@ import smtplib
from rhnConfig import CFG
from rhnLog import log_error
+from rhn.connections import idn_pune_to_unicode
# check if the headers have the minimum required fields
def __check_headers(h):
@@ -29,11 +30,13 @@ def __check_headers(h):
# does not look like a dictionary
h = {}
if not h.has_key("Subject"):
- h["Subject"] = "RHN System Mail From %s" % os.uname()[1]
+ h["Subject"] = "RHN System Mail From %s" % idn_pune_to_unicode(os.uname()[1])
if not h.has_key("To"):
to = CFG.TRACEBACK_MAIL
else:
to = h["To"]
+ if not ("Content-Type" in h):
+ h["Content-Type"] = "text/plain; charset=utf-8"
if type(to) in [type([]), type(())]:
toaddrs = to
to = string.join(to, ', ')
@@ -49,8 +52,9 @@ def send(headers, body, sender = None, lazy = 0):
sender = headers["From"]
joined_headers = ''
for h in headers.keys():
- joined_headers += "%s: %s\n" % (h, headers[h])
+ joined_headers += "%s: %s\n" % (h, headers[h].encode('utf-8'))
server = smtplib.SMTP('localhost')
- server.sendmail(sender, toaddrs, "%s\n%s\n" % (joined_headers, body))
+ msg = "%s\n%s\n" % (joined_headers, body)
+ server.sendmail(sender, toaddrs, msg.encode('utf-8'))
server.quit()
commit bd0f7cabcac195d08f6c11a79cfb662681872bc7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 11:45:23 2011 +0200
683200 - convert hostname in subject from pune to unicode
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 07da5d8..4dfaabe 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -27,7 +27,7 @@ import time
import types
import exceptions
from optparse import Option, OptionParser
-from rhn.connections import idn_ascii_to_pune
+from rhn.connections import idn_ascii_to_pune, idn_pune_to_unicode
import gettext
t = gettext.translation('spacewalk-backend-server', fallback=True)
@@ -355,7 +355,7 @@ def sendMail(forceEmail=0):
if body:
print _("+++ sending log as an email +++")
headers = {
- 'Subject' : _('RHN Management Satellite sync. report from %s') % os.uname()[1],
+ 'Subject' : _('RHN Management Satellite sync. report from %s') % idn_pune_to_unicode(os.uname()[1]),
}
sndr = CFG.get('traceback_mail', 'root@localhost')
rhnMail.send(headers, body, sender=sndr)
commit 6f658cfa23f1eada2b2022d86b6a218b6daa5a06
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 10:38:28 2011 +0200
localize satsync messages
diff --git a/backend/satellite_tools/messages.py b/backend/satellite_tools/messages.py
index 6a4c7a3..ac671f2 100644
--- a/backend/satellite_tools/messages.py
+++ b/backend/satellite_tools/messages.py
@@ -20,63 +20,67 @@
All rights reserved.
"""
-failed_step = """
+import gettext
+t = gettext.translation('spacewalk-backend-server', fallback=True)
+_ = t.ugettext
+
+failed_step = _("""
ERROR: executing step %s. Error is:
%s
-"""
+""")
-file_dir_error = """
+file_dir_error = _("""
ERROR: there was a problem accessing the channel data from your temporary
repository. Did you migrate all of the data from the channel ISOs
do this directory? If so, please recheck the channels ISOs, ensure
that you have them all, and then iteratively remount and repopulate
the temporary repository (%s).
-"""
+""")
-syncer_error = """
+syncer_error = _("""
ERROR: there was a problem synchronizing the information.
Error message: %s
-"""
+""")
-iss_not_available = """
+iss_not_available = _("""
ERROR: The Server listed within iss-parent is not configured for ISS
capability.
Please review your configuration before trying again.
-"""
+""")
-parent_channel_error = """
+parent_channel_error = _("""
ERROR: a child-channel cannot be synced without its parent being synced as
well. A parent needs to be either (a) previously synced or (b) synced
in tandem with the desired child-channel. Missing parents for this
transaction:
%s
-"""
+""")
-invalid_channel_family_error = """
+invalid_channel_family_error = _("""
ERROR: you are not entitled to sync a channel in this set of channels.
Please contact your sales rep or RHN contact
-%s"""
+%s""")
-not_enough_diskspace = " ERROR: not enough free space (%s KB) on device."
+not_enough_diskspace = _(" ERROR: not enough free space (%s KB) on device.")
-package_fetch_successful = " %3d/%s Fetch successful: %s (%s bytes)"
-package_fetch_extinct = " %3d/%s Extinct package: %s"
-package_fetch_total_size = " Total size: %s"
-package_fetch_remain_size_time = " Downloaded %s of %s. Estimated remaining time: %s"
-package_fetch_failed = " %3d/%s Fetch unsuccessful: %s"
-package_fetch_summary = " RPM fetch summary: %s"
-package_fetch_summary_success = " success: %d"
-package_fetch_summary_failed = " failed: %d"
-package_fetch_summary_extinct = " extinct: %d"
+package_fetch_successful = _(" %3d/%s Fetch successful: %s (%s bytes)")
+package_fetch_extinct = _(" %3d/%s Extinct package: %s")
+package_fetch_total_size = _(" Total size: %s")
+package_fetch_remain_size_time = _(" Downloaded %s of %s. Estimated remaining time: %s")
+package_fetch_failed = _(" %3d/%s Fetch unsuccessful: %s")
+package_fetch_summary = _(" RPM fetch summary: %s")
+package_fetch_summary_success = _(" success: %d")
+package_fetch_summary_failed = _(" failed: %d")
+package_fetch_summary_extinct = _(" extinct: %d")
-package_parsing = " Retrieving / parsing *relevant* package metadata: %s (%s)"
-erratum_parsing = " Retrieving / parsing errata data: %s (%s)"
-kickstart_parsing = " Retrieving / parsing kickstart data: %s (%s)"
-kickstart_downloading = " Retrieving / parsing kickstart tree files: %s (%s)"
-package_importing = " Importing *relevant* package metadata: %s (%s)"
-warning_slow = " * WARNING: this may be a slow process."
-link_channel_packages = "Linking packages to channels"
-errata_importing = " Importing *relevant* errata: %s (%s)"
-kickstart_import_nothing_to_do = " No new kickstartable tree to import"
-kickstart_importing = "Importing kickstartable trees (%d)"
-kickstart_imported = "Imported kickstartable trees (%d)"
+package_parsing = _(" Retrieving / parsing *relevant* package metadata: %s (%s)")
+erratum_parsing = _(" Retrieving / parsing errata data: %s (%s)")
+kickstart_parsing = _(" Retrieving / parsing kickstart data: %s (%s)")
+kickstart_downloading = _(" Retrieving / parsing kickstart tree files: %s (%s)")
+package_importing = _(" Importing *relevant* package metadata: %s (%s)")
+warning_slow = _(" * WARNING: this may be a slow process.")
+link_channel_packages = _("Linking packages to channels")
+errata_importing = _(" Importing *relevant* errata: %s (%s)")
+kickstart_import_nothing_to_do = _(" No new kickstartable tree to import")
+kickstart_importing = _("Importing kickstartable trees (%d)")
+kickstart_imported = _("Imported kickstartable trees (%d)")
commit ae519c1e17d43d0a93a3abff5ab9bcb866597c58
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 10:31:16 2011 +0200
provide estimation about remaining time for downloading rpm
diff --git a/backend/satellite_tools/messages.py b/backend/satellite_tools/messages.py
index 3c67e3a..6a4c7a3 100644
--- a/backend/satellite_tools/messages.py
+++ b/backend/satellite_tools/messages.py
@@ -61,6 +61,8 @@ not_enough_diskspace = " ERROR: not enough free space (%s KB) on device."
package_fetch_successful = " %3d/%s Fetch successful: %s (%s bytes)"
package_fetch_extinct = " %3d/%s Extinct package: %s"
+package_fetch_total_size = " Total size: %s"
+package_fetch_remain_size_time = " Downloaded %s of %s. Estimated remaining time: %s"
package_fetch_failed = " %3d/%s Fetch unsuccessful: %s"
package_fetch_summary = " RPM fetch summary: %s"
package_fetch_summary_success = " success: %d"
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 59d167f..07da5d8 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -18,6 +18,7 @@
# __lang. imports__
+import datetime
import os
import sys
import stat
@@ -1726,11 +1727,25 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
pkgs_total = len(missing_fs_packages)
pkg_current = 0
cfg = config.initUp2dateConfig()
+ total_size = 0
+
+ #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']
+
+ log(1, messages.package_fetch_total_size %
+ (self._bytes_to_fuzzy(total_size)))
+
+ processed_size = 0
+ 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']
@@ -1791,7 +1806,15 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# Package successfully saved
filename = os.path.basename(rpmManip.relative_path)
+
+ # Determine downloaded size and remaining time
size = package['package_size']
+ processed_size = processed_size + size
+ current_time = round(time.time())
+ remain_time = (datetime.timedelta(seconds=current_time-start_time))*(total_size/processed_size - 1)
+
+ log(1, messages.package_fetch_remain_size_time %
+ (self._bytes_to_fuzzy(processed_size), self._bytes_to_fuzzy(total_size), remain_time))
log(1, messages.package_fetch_successful %
(pkg_current, pkgs_total, filename, size))
@@ -1818,6 +1841,22 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
log(2, messages.package_fetch_summary_extinct % extinct_count,
notimeYN=1)
+ # Translate x bytes to string "x MB", "x GB" or "x kB"
+ def _bytes_to_fuzzy(self, bytes):
+ kilo=1024
+ mega=kilo*1024
+ giga=mega*1024
+ if (bytes/kilo == 0):
+ return "%d bytes" %(bytes)
+ elif (bytes/mega == 0):
+ return "%d kB" %(bytes / 1024)
+ elif (bytes/giga == 0):
+ mega_value=bytes / mega
+ return "%d.%d MB" %(mega_value, (bytes % mega) / kilo)
+ else:
+ giga_value=bytes / giga
+ return "%d.%d GB" %(giga_value, (bytes % giga) / mega)
+
def _get_package_stream(self, channel, package_id, nvrea, sources):
""" returns (filepath, stream), so in the case of a "wire source",
the return value is, of course, (None, stream)
13 years, 1 month
2 commits - backend/server client/tools proxy/proxy
by Miroslav Suchý
backend/server/handlers/app/packages.py | 5 ++++-
client/tools/rhnpush/rhnpush.py | 2 +-
client/tools/rhnpush/rhnpush.sgml | 2 +-
client/tools/rhnpush/uploadLib.py | 18 +++++++-----------
proxy/proxy/pm/rhn_package_manager.py | 2 ++
proxy/proxy/pm/rhn_package_manager.sgml | 6 ++++++
6 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 775c73607c6908bac95b0a41c6a9e91faeecc0fa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 10:06:10 2011 +0200
678053 - add option --no-session-caching to rhn_package_manager
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 7466156..337e6d0 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -76,6 +76,8 @@ def main():
Option( '--copyonly', action='store_true', help="Only copy packages; don't reimport"),
Option( '--test', action='store_true', help='Only print the packages to be pushed'),
Option( '--no-ssl', action='store_true', help='Turn off SSL (not recommended).'),
+ Option( '--no-session-caching', action='store_true',
+ help='Disables session-token authentication.'),
Option('-?','--usage', action='store_true', help="Briefly describe the options"),
]
# Process the command line arguments
diff --git a/proxy/proxy/pm/rhn_package_manager.sgml b/proxy/proxy/pm/rhn_package_manager.sgml
index 8a995a5..4c010d7 100644
--- a/proxy/proxy/pm/rhn_package_manager.sgml
+++ b/proxy/proxy/pm/rhn_package_manager.sgml
@@ -162,6 +162,12 @@ Manages RPM packages for the RHN proxy
<para>Turn off SSL (not recommended).</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--no-session-caching</term>
+ <listitem>
+ <para>This option disabled session token authentication. Useful if you want to push to two or more different servers.</para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term>-h, --help</term>
<listitem>
commit 698504378070e46be17e338f493005c928249167
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 5 09:58:24 2011 +0200
do not test if rhnParent can handle session caching
All servers since RHN Satellite 4.0.6 can do that.
But do not remove --no-session-caching since it can be useful when
you change rhnParent.
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index 7b24bb1..53714de 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -85,7 +85,10 @@ class Packages(RPC_Base):
self.functions.append('getSourcePackageMD5sumBySession')
def no_op(self):
- """ This is so the client can tell if the satellite supports session tokens or not. """
+ """ This is so the client can tell if the satellite supports session tokens or not.
+
+ This was used in rhnpush-5.5.26 and older. When there will be no such version of rhnpush in wild,
+ then this function can be safely removed."""
return 1
def uploadPackageInfo(self, username, password, info):
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 40566df..ce7d4b1 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -83,7 +83,7 @@ def main():
Option( '--no-cache', action='store_true', help='Do not create a username/password cache'),
Option( '--extended-test', action='store_true', help='Perform a more verbose test'),
Option( '--no-session-caching', action='store_true',
- help='Disables session-token support. Useful for using rhnpush with pre-4.0.6 satellites.'),
+ help='Disables session-token authentication.'),
Option( '--tolerant', action='store_true',
help='If rhnpush errors while uploading a package, continue uploading the rest of the packages.')
]
diff --git a/client/tools/rhnpush/rhnpush.sgml b/client/tools/rhnpush/rhnpush.sgml
index 8c89b46..c76f69e 100644
--- a/client/tools/rhnpush/rhnpush.sgml
+++ b/client/tools/rhnpush/rhnpush.sgml
@@ -292,7 +292,7 @@ Utility to push binary and source RPMs into an RHN channel.
<varlistentry>
<term>--no-session-caching</term>
<listitem>
- <para>This option disabled session token support. Useful for satellites older than 4.0.6</para>
+ <para>This option disabled session token authentication. Useful if you want to push to two or more different servers.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index dcd4bc6..5925105 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -478,19 +478,15 @@ class UploadClass:
else:
self.setUsernamePassword()
- #1/3/06 wregglej 173287 rhnpush needs to work against older satellites, so we need a way to see if they can handle
- #session token authentication
def new_sat_test(self):
+ """ test if we can use session caching
+
+ Historically this function was used to test if rhnParent can handle session token authentication.
+ All curent satellites (4.0.6+) can do that. So it only return False, if we use --no-session-cachine.
+ """
if self.new_sat is None:
- if self.options.no_session_caching:
- self.new_sat = 0
- else:
- self.new_sat = 1
- try:
- self.server.packages.no_op()
- except:
- self.new_sat = 0
- return self.new_sat
+ self.new_sat = not self.options.no_session_caching
+ return self.new_sat
def _processFile(self, filename, relativeDir=None, source=None, nosig=None):
""" Processes a file
13 years, 1 month
Changes to 'refs/tags/spacewalk-search-1.5.1-1'
by Tomas Lestach
Tag 'spacewalk-search-1.5.1-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-04 15:52 +0000
Tagging package [spacewalk-search] version [1.5.1-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-java-1.5.20-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-search] release [1.5.1-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.20-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.20-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-04 15:51 +0000
Tagging package [spacewalk-java] version [1.5.20-1] in directory [java/].
Changes since spacewalk-proxy-1.5.3-1:
Tomas Lestach (3):
648640 - introduce errata analyzer for rhn-search
648640 - keep fineGrained option when changing number of custom items
Automatic commit of package [spacewalk-java] release [1.5.20-1].
---
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 1
java/spacewalk-java.spec | 7 ++-
rel-eng/packages/spacewalk-java | 2
search-server/spacewalk-search/src/config/search/rhn_search.conf | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 17 +++++++
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java | 22 +++++-----
8 files changed, 43 insertions(+), 15 deletions(-)
---
13 years, 1 month
2 commits - java/spacewalk-java.spec rel-eng/packages search-server/spacewalk-search
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 6 +++++-
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit ac29f52e32e0735d0bf9322ae92230ebe8c7ae25
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 4 17:52:00 2011 +0200
Automatic commit of package [spacewalk-search] release [1.5.1-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index a87d684..7ae1173 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.4.1-1 search-server/spacewalk-search/
+1.5.1-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index dd8f645..81250df 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -117,6 +117,10 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Wed May 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.1-1
+- 648640 - introduce errata analyzer for rhn-search (tlestach(a)redhat.com)
+- Bumping package versions for 1.5 (msuchy(a)redhat.com)
+
* Mon Feb 07 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1
- don't duplicate files from spacewalk-search.jar on filesystem
- move config.xml back to jar
commit dea82a049f4543be7edf0023813c5c3e468267ba
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 4 17:51:37 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.20-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 113c5a0..82441c9 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.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
@@ -538,6 +538,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 04 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.20-1
+- 648640 - keep fineGrained option when changing number of custom items
+ (tlestach(a)redhat.com)
+- 648640 - introduce errata analyzer for rhn-search (tlestach(a)redhat.com)
+
* Wed May 04 2011 Miroslav Suchý 1.5.19-1
- sort inputs on the page
- 683200 - encode hostname to IDN in MonitoringConfig.do page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d6eebd7..833c6b1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.19-1 java/
+1.5.20-1 java/
13 years, 1 month
2 commits - java/code search-server/spacewalk-search
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 1
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 1
search-server/spacewalk-search/src/config/search/rhn_search.conf | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 17 +++++++
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java | 22 +++++-----
6 files changed, 36 insertions(+), 13 deletions(-)
New commits:
commit 6f9d4be39f29357a93f83f460bb76e378a5781c5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 4 16:53:17 2011 +0200
648640 - keep fineGrained option when changing number of custom items
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
index f2b4504..0b89789 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
@@ -253,6 +253,7 @@ public class PackageSearchAction extends RhnAction {
request.setAttribute("allChannels", allChannels);
request.setAttribute("channel_filter", form.getString("channel_filter"));
request.setAttribute("relevant", relevantFlag ? "yes" : "no");
+ request.setAttribute(FINE_GRAINED, fineGrained ? "yes" : "no");
// Default where to search criteria
request.setAttribute("whereCriteria", searchCriteria);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index 24d7aad..44c7394 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -163,6 +163,7 @@ public class ErrataSearchAction extends RhnAction {
String search = request.getParameter("search_string");
String viewmode = request.getParameter("view_mode");
+ String fineGrained = request.getParameter(FINE_GRAINED);
List searchOptions = new ArrayList();
// setup the option list for select box (view_mode).
@@ -174,6 +175,7 @@ public class ErrataSearchAction extends RhnAction {
request.setAttribute("search_string", search);
request.setAttribute("view_mode", viewmode);
request.setAttribute("searchOptions", searchOptions);
+ request.setAttribute(FINE_GRAINED, fineGrained);
// Process the dates, default the start date to yesterday
// and end date to today.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
index 0e7342e..cc8eb06 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
@@ -165,6 +165,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
request.setAttribute(VIEW_MODE, request.getParameter(VIEW_MODE));
request.setAttribute(SEARCH_STRING, request.getParameter(SEARCH_STRING));
request.setAttribute(WHERE_TO_SEARCH, whereToSearch);
+ request.setAttribute(FINE_GRAINED, request.getParameter(FINE_GRAINED));
if (invertResults) {
request.setAttribute(INVERT_RESULTS, "on");
commit 665963d3eb98066909fb7e6496bc90bb57b6d38f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 2 15:54:25 2011 +0200
648640 - introduce errata analyzer for rhn-search
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index e3cf676..24d7aad 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -569,11 +569,11 @@ public class ErrataSearchAction extends RhnAction {
query = escapeSpecialChars(query);
return "(description:(" + query + ") topic:(" + query + ") solution:(" +
query + ") notes:(" + query + ") product:(" + query + ")" +
- " advisoryName:(" + query + ") synopsis:(" + query + "))";
+ " name:(" + query + ") synopsis:(" + query + "))";
}
else if (OPT_ADVISORY.equals(mode)) {
query = escapeSpecialChars(query);
- return "(advisoryName:(" + query + "))";
+ return "(name:(" + query + "))";
}
else if (OPT_PKG_NAME.equals(mode)) {
// when searching the name field, we also want to include the filename
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search.conf b/search-server/spacewalk-search/src/config/search/rhn_search.conf
index 6a3cb7d..d6f0b64 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search.conf
@@ -4,7 +4,7 @@ search.max_hits_returned=500
search.connection.driver_class=oracle.jdbc.driver.OracleDriver
search.score_threshold=.10
search.system_score_threshold=.01
-search.errata_score_threshold=.20
+search.errata_score_threshold=.01
search.errata.advisory_score_threshold=.30
search.min_ngram = 1
search.max_ngram = 5
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
index 58609f5..271dab6 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
@@ -455,6 +455,9 @@ public class IndexManager {
else if (indexName.compareTo(BuilderFactory.SERVER_TYPE) == 0) {
return getServerAnalyzer();
}
+ else if (indexName.compareTo(BuilderFactory.ERRATA_TYPE) == 0) {
+ return getErrataAnalyzer();
+ }
else if (indexName.compareTo(BuilderFactory.SNAPSHOT_TAG_TYPE) == 0) {
return getSnapshotTagAnalyzer();
}
@@ -569,7 +572,7 @@ public class IndexManager {
}
}
else if (indexName.compareTo(BuilderFactory.ERRATA_TYPE) == 0) {
- if (guessMainQueryTerm.compareTo("advisoryName") == 0) {
+ if (guessMainQueryTerm.compareTo("name") == 0) {
if (hits.score(x) < errata_advisory_score_threshold) {
if (log.isDebugEnabled()) {
log.debug("hits.score(" + x + ") is " + hits.score(x));
@@ -738,6 +741,18 @@ public class IndexManager {
return analyzer;
}
+ private Analyzer getErrataAnalyzer() {
+ PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new
+ NGramAnalyzer(min_ngram, max_ngram));
+ analyzer.addAnalyzer("advisoryName", new KeywordAnalyzer());
+ analyzer.addAnalyzer("synopsis", new StandardAnalyzer());
+ analyzer.addAnalyzer("description", new StandardAnalyzer());
+ analyzer.addAnalyzer("topic", new StandardAnalyzer());
+ analyzer.addAnalyzer("solution", new StandardAnalyzer());
+
+ return analyzer;
+ }
+
private Analyzer getSnapshotTagAnalyzer() {
PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new
NGramAnalyzer(min_ngram, max_ngram));
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java
index 665ff51..ad5a01d 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ErrataDocumentBuilder.java
@@ -26,9 +26,9 @@ import java.util.Map;
* @version $Rev$
*/
public class ErrataDocumentBuilder implements DocumentBuilder {
-
+
// TODO: add some information about fields and their indexing states.
-
+
/**
* {@inheritDoc}
*/
@@ -36,25 +36,29 @@ public class ErrataDocumentBuilder implements DocumentBuilder {
Document doc = new Document();
doc.add(new Field("id", objId.toString(), Field.Store.YES,
Field.Index.UN_TOKENIZED));
-
for (Iterator<String> iter = metadata.keySet().iterator(); iter.hasNext();) {
Field.Store store = Field.Store.NO;
Field.Index tokenize = Field.Index.TOKENIZED;
-
+
String name = iter.next();
String value = metadata.get(name);
-
- if (name.equals("name")) {
+
+ if (name.equals("name") || name.equals("advisoryName")) {
store = Field.Store.YES;
}
- else if (name.equals("advisoryName")) {
- store = Field.Store.YES;
+ else if (name.equals("synopsis") || name.equals("description") ||
+ name.equals("topic") || name.equals("solution")) {
+ // index, but do not store
+ }
+ else {
+ // skip - do not store or index
+ continue;
}
doc.add(new Field(name, String.valueOf(value), store,
tokenize));
- }
+ }
return doc;
}
}
13 years, 1 month
Changes to 'refs/tags/spacewalk-proxy-1.5.3-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-1.5.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-04 15:25 +0000
Tagging package [spacewalk-proxy] version [1.5.3-1] in directory [proxy/proxy/].
Changes since spacewalk-setup-1.5.4-1:
Miroslav Suchý (2):
do not import modules through magic
Automatic commit of package [spacewalk-proxy] release [1.5.3-1].
---
proxy/proxy/apacheHandler.py | 8 ++++++--
proxy/proxy/apacheServer.py | 6 ++++--
proxy/proxy/broker/rhnBroker.py | 6 ++++--
proxy/proxy/broker/rhnRepository.py | 5 ++++-
proxy/proxy/pm/rhn_package_manager.py | 2 +-
proxy/proxy/redirect/rhnRedirect.py | 7 +++++--
proxy/proxy/rhnAuthCacheClient.py | 6 ++++--
proxy/proxy/rhnProxyAuth.py | 7 +++++--
proxy/proxy/rhnShared.py | 7 +++++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
11 files changed, 43 insertions(+), 18 deletions(-)
---
13 years, 1 month
2 commits - proxy/proxy rel-eng/packages
by Miroslav Suchý
proxy/proxy/apacheHandler.py | 8 ++++++--
proxy/proxy/apacheServer.py | 6 ++++--
proxy/proxy/broker/rhnBroker.py | 6 ++++--
proxy/proxy/broker/rhnRepository.py | 5 ++++-
proxy/proxy/pm/rhn_package_manager.py | 2 +-
proxy/proxy/redirect/rhnRedirect.py | 7 +++++--
proxy/proxy/rhnAuthCacheClient.py | 6 ++++--
proxy/proxy/rhnProxyAuth.py | 7 +++++--
proxy/proxy/rhnShared.py | 7 +++++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
11 files changed, 43 insertions(+), 18 deletions(-)
New commits:
commit a12e6c81c6ccac8c7a336cd6c780435bf7583869
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 17:25:16 2011 +0200
Automatic commit of package [spacewalk-proxy] release [1.5.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 82c89e9..b969419 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.2
+Version: 1.5.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,9 @@ fi
%changelog
+* Wed May 04 2011 Miroslav Suchý 1.5.3-1
+- do not import modules through magic
+
* Tue Apr 19 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.5.2-1
- 697447 - handle all other request
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index e3a46c2..eb19afc 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.5.2-1 proxy/proxy/
+1.5.3-1 proxy/proxy/
commit de868e9f42ebd3d40ad5a7bd034c9192ce1719ac
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 17:18:57 2011 +0200
do not import modules through magic
diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py
index 2828c60..4c358c2 100644
--- a/proxy/proxy/apacheHandler.py
+++ b/proxy/proxy/apacheHandler.py
@@ -26,8 +26,12 @@ from rhnConstants import *
from rhn import rpclib, connections
## common imports
-from spacewalk.common import rhnApache, rhnFlags, log_debug, log_error, CFG, \
- UserDictCase, Traceback, rhnFault, rhnException, apache
+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.rhnLib import setHeaderValue
## local imports
diff --git a/proxy/proxy/apacheServer.py b/proxy/proxy/apacheServer.py
index e898612..1fb20e2 100644
--- a/proxy/proxy/apacheServer.py
+++ b/proxy/proxy/apacheServer.py
@@ -17,8 +17,10 @@
# $Id: apacheServer.py,v 1.81 2005/07/05 17:39:03 wregglej Exp $
# common module imports
-from spacewalk.common import CFG, initCFG, initLOG, log_setreq, Traceback, \
- log_debug, apache
+from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnLog import initLOG, log_setreq, log_debug
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common import apache
class HandlerWrap:
""" Wrapper handlers to catch unwanted exceptions """
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index aa6dae3..2849668 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -23,8 +23,10 @@ import re
# common module imports
from spacewalk.common.rhnLib import parseUrl
-from spacewalk.common import UserDictCase, rhnFlags, log_debug, log_error, CFG, \
- rhnFault, apache
+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.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py
index e50b6d4..928b377 100644
--- a/proxy/proxy/broker/rhnRepository.py
+++ b/proxy/proxy/broker/rhnRepository.py
@@ -30,7 +30,10 @@ from operator import truth
import xmlrpclib
## common imports
-from spacewalk.common import rhnRepository, log_debug, log_error, CFG, rhnFault
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common import rhnRepository
from spacewalk.common.rhnTranslate import _
## local imports
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 8ed90f7..7466156 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -44,7 +44,7 @@ except ImportError:
from optik import Option, OptionParser
# RHN imports
-from spacewalk.common import CFG, initCFG
+from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.common.rhnLib import parseUrl
initCFG('proxy.package_manager')
diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py
index 8e08229..b5f8abe 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -21,8 +21,11 @@ import socket
import re
# common module imports
-from spacewalk.common import log_debug, log_error, CFG, rhnFlags, rhnFault, rhnLib, \
- Traceback, apache
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common import rhnFlags, rhnLib, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/rhnAuthCacheClient.py b/proxy/proxy/rhnAuthCacheClient.py
index 23b16c9..833b087 100644
--- a/proxy/proxy/rhnAuthCacheClient.py
+++ b/proxy/proxy/rhnAuthCacheClient.py
@@ -23,7 +23,9 @@
import socket
## local imports
-from spacewalk.common import log_debug, log_error, Traceback, rhnFault
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnException import rhnFault
from spacewalk.common.rhnTranslate import _
from rhnAuthProtocol import CommunicationError, send, recv
from xmlrpclib import Fault
@@ -171,7 +173,7 @@ class Shelf:
#-------------------------------------------------------------------------------
# test code
if __name__ == '__main__':
- from spacewalk.common import initCFG
+ from spacewalk.common.rhnConfig import initCFG
initCFG("proxy.broker")
s = Shelf(('localhost', 9999))
s['1234'] = [1, 2, 3, 4, None, None]
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index b791185..bb8c988 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -30,8 +30,11 @@ from rhn import SSL
## common imports
from spacewalk.common.rhnLib import parseUrl
-from spacewalk.common import Traceback, log_debug, log_error, CFG, \
- rhnCache, rhnFault
+from spacewalk.common.rhnTB import Traceback
+from spacewalk.common.rhnLog import log_debug, log_error
+from spacewalk.common.rhnConfig import CFG
+from spacewalk.common.rhnException import rhnFault
+from spacewalk.common import rhnCache
from spacewalk.common.rhnTranslate import _
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index d11134e..84131ef 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -26,8 +26,11 @@ from rhn import connections
from rhn.SSL import TimeoutException
## common imports
-from spacewalk.common import UserDictCase, rhnFlags, log_debug, log_error, \
- Traceback, CFG, rhnException, rhnFault, rhnLib, apache
+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.rhnTranslate import _
## local imports
13 years, 1 month
Changes to 'refs/tags/spacewalk-setup-1.5.4-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-04 14:29 +0000
Tagging package [spacewalk-setup] version [1.5.4-1] in directory [spacewalk/setup/].
Changes since oracle-lib-compat-11.2.0.4-1:
Jan Pazdziora (2):
On RHEL 6, tomcat6 no longer sources the setenv.sh so we need to source it ourselves.
Automatic commit of package [spacewalk-setup] release [1.5.4-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/share/tomcatX.conf.3 | 2 ++
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
3 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 1 month
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 9f4ac0cd2517c3784b3764312341829afb216b58
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 16:29:13 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.4-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d3e9a2b..d6cfb6c 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.3-1 spacewalk/setup/
+1.5.4-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index a6f29c4..f050900 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.3
+Version: 1.5.4
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* 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.
+
* Wed Apr 27 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.3-1
- Drop the schema only if exists (slukasik(a)redhat.com)
13 years, 1 month
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/share/tomcatX.conf.3 | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit cf399e84fa3b23aad6cdb5c5dc81b1fb3ff9eb23
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 16:16:44 2011 +0200
On RHEL 6, tomcat6 no longer sources the setenv.sh so we need to source it ourselves.
Unfortunatelly, the .conf file is processed twice in
/etc/rc.d/init.d/tomcat6 -- once it is sourced and then it is processed
via awk which creates a series of "export $the_original_line" commands.
Luckily, the semicolon hack seems to work and allows us to put
the sourcing there.
diff --git a/spacewalk/setup/share/tomcatX.conf.3 b/spacewalk/setup/share/tomcatX.conf.3
new file mode 100644
index 0000000..6269ee7
--- /dev/null
+++ b/spacewalk/setup/share/tomcatX.conf.3
@@ -0,0 +1,2 @@
+^_HACK_AROUND_PARSEOPTIONS=1.+setenv\.sh\n
+_HACK_AROUND_PARSEOPTIONS=1 ; . $CATALINA_HOME/bin/setenv.sh
13 years, 1 month
Changes to 'refs/tags/oracle-lib-compat-11.2.0.4-1'
by Jan Pazdziora
Tag 'oracle-lib-compat-11.2.0.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-04 14:27 +0000
Tagging package [oracle-lib-compat] version [11.2.0.4-1] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-java-1.5.19-1:
Jan Pazdziora (2):
We unset LD_PRELOAD to force ldd to show the libldap line with => even if LD_PRELOAD was already set.
Automatic commit of package [oracle-lib-compat] release [11.2.0.4-1].
---
projects/oracle-lib-compat/oracle-lib-compat.spec | 6 +++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 ++
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 1 month
projects/oracle-lib-compat rel-eng/packages
by Jan Pazdziora
projects/oracle-lib-compat/oracle-lib-compat.spec | 6 +++++-
rel-eng/packages/oracle-lib-compat | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3c1f2cd4b94aaa538d8938f746818fadfb18f752
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 16:27:27 2011 +0200
Automatic commit of package [oracle-lib-compat] release [11.2.0.4-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 94ef544..82dc01b 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.3
+Version: 11.2.0.4
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -115,6 +115,10 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* 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.
+
* Mon Jan 17 2011 Jan Pazdziora 11.2.0.3-1
- Set diag_adr_enabled to off.
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index 827c77e..bb21bea 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.3-1 projects/oracle-lib-compat/
+11.2.0.4-1 projects/oracle-lib-compat/
13 years, 1 month
projects/oracle-lib-compat
by Jan Pazdziora
projects/oracle-lib-compat/tomcat-setenv.sh | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 42eba5234a9c2ce5f724c78819507493f6a87c9d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 4 15:58:48 2011 +0200
We unset LD_PRELOAD to force ldd to show the libldap line with => even if LD_PRELOAD was already set.
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
index bb181a3..ee14820 100644
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ b/projects/oracle-lib-compat/tomcat-setenv.sh
@@ -3,6 +3,8 @@
# in libclntsh.so* upon tomcat5 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
+ unset LD_PRELOAD
export LD_PRELOAD=`ldd $i | perl -lne '/^\s+libldap\S+\s+=>\s+(\S+)/ and print $1 and exit'`
break
fi
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.19-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.19-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-04 12:53 +0000
Tagging package [spacewalk-java] version [1.5.19-1] in directory [java/].
Changes since spacewalk-backend-1.5.15-1:
Miroslav Suchý (3):
683200 - encode hostname to IDN in MonitoringConfig.do page
sort inputs on the page
Automatic commit of package [spacewalk-java] release [1.5.19-1].
---
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 26 ++++++++--
java/code/webapp/WEB-INF/struts-config.xml | 1
java/spacewalk-java.spec | 6 +-
rel-eng/packages/spacewalk-java | 2
4 files changed, 30 insertions(+), 5 deletions(-)
---
13 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5b36d1dc664a222ee85641ff40feddd0599efd69
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 14:53:44 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.19-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2378fa3..113c5a0 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.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
@@ -538,6 +538,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 04 2011 Miroslav Suchý 1.5.19-1
+- sort inputs on the page
+- 683200 - encode hostname to IDN in MonitoringConfig.do page
+
* Tue May 03 2011 Miroslav Suchý 1.5.18-1
- 682112 - correct displayed systems consuming channel entitlements
- 683200 - encode hostname to IDN in GeneralConfig.do page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3121fdc..d6eebd7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.18-1 java/
+1.5.19-1 java/
13 years, 1 month
2 commits - java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 26 ++++++++--
java/code/webapp/WEB-INF/struts-config.xml | 1
2 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit cccc19a838585784dbd030a0c6c776ffa9d4492d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:43:00 2011 +0200
sort inputs on the page
they are sometimes displayed in different order, which is confusing
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index f087a48..61da710 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -34,6 +34,8 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
import java.net.IDN;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -102,6 +104,15 @@ public class MonitoringConfigAction extends BaseConfigAction {
value));
}
+ // sort inputs in form using Description
+ Collections.sort(nameDescVals, new Comparator() {
+ public int compare(Object x, Object y) {
+ String xName = ((NameDescriptionValue)x).getName();
+ String yName = ((NameDescriptionValue)y).getName();
+ return xName.compareTo(yName);
+ }
+ }
+ );
if (isSubmitted(form)) {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user);
commit 3e738c0ce75fe4e4e21cf8959d775cfef4648603
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed May 4 10:37:48 2011 +0200
683200 - encode hostname to IDN in MonitoringConfig.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index fe596e7..f087a48 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -33,6 +33,7 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.DynaActionForm;
+import java.net.IDN;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -53,6 +54,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
private static Logger logger = Logger.getLogger(MonitoringConfigAction.class);
public static final String IS_MONITORING_SCOUT = "is_monitoring_scout";
+ public static final String MDOM = "MDOM";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping, ActionForm formIn,
@@ -90,9 +92,14 @@ public class MonitoringConfigAction extends BaseConfigAction {
logger.debug("execute() - Name: " + ci.getName() +
" value: " + ci.getDefinition());
}
- nameDescVals.add(new NameDescriptionValue(ci.getName(),
- LocalizationService.getInstance().getMessage(ci.getName()),
- ci.getDefinition()));
+ String value = ci.getDefinition();
+ String name = ci.getName();
+ if (MDOM.equals(name)) {
+ value = IDN.toUnicode(value);
+ }
+ nameDescVals.add(new NameDescriptionValue(name,
+ LocalizationService.getInstance().getMessage(name),
+ value));
}
@@ -100,6 +107,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user);
csc.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT,
(Boolean) form.get(IS_MONITORING_SCOUT));
+ csc.updateString(MDOM, IDN.toASCII(form.getString(MDOM)));
if (csc.getKeysToBeUpdated().size() > 0) {
valuesChanged = true;
ValidatorError[] verrors = csc.storeConfiguration();
@@ -124,6 +132,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
form.set(IS_MONITORING_SCOUT,
new Boolean(Config.get().getBoolean(
ConfigDefaults.WEB_IS_MONITORING_SCOUT)));
+ // form.set(MDOM, IDN.toUnicode((String) form.get(MDOM)));
}
req.setAttribute("configList", nameDescVals);
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 7a841a7..3d43fe0 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -396,6 +396,7 @@
<form-property name="squelch" type="java.lang.String"/>
<form-property name="is_monitoring_scout" type="java.lang.Boolean"/>
<form-property name="submitted" type="java.lang.Boolean"/>
+ <form-property name="MDOM" type="java.lang.String"/>
</form-bean>
<form-bean name="scheduleRemoteCmdForm"
13 years, 1 month
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 1ba7286fc8aff9a045903d83b7489e3f229eec74
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:50:11 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 01a5bb7..b9a11b3 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.14
+Version: 1.5.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.15-1
+- some wierd packages have files in iso8859-1 not utf-8
+
* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
- 701297 - don't try to read rpm header from mpm package
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 60cc880..3c16d99 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.14-1 backend/
+1.5.15-1 backend/
13 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.5.15-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-04 11:50 +0000
Tagging package [spacewalk-backend] version [1.5.15-1] in directory [backend/].
Changes since oracle-rhnsat-selinux-10.2.0.20-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.5.15-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 1 month
Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.20-1'
by Michael Mraka
Tag 'oracle-rhnsat-selinux-10.2.0.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-04 11:49 +0000
Tagging package [oracle-rhnsat-selinux] version [10.2.0.20-1] in directory [selinux/oracle-rhnsat-selinux/].
Changes since spacewalk-java-1.5.18-1:
Michael Mraka (3):
some wierd packages have files in iso8859-1 not utf-8
fixed typo
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.20-1].
---
backend/server/importlib/packageImport.py | 6 +++++-
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
---
13 years, 1 month
3 commits - backend/server rel-eng/packages selinux/oracle-rhnsat-selinux
by Michael Mraka
backend/server/importlib/packageImport.py | 6 +++++-
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit cdace50eb931a481b5822dff02507f340d986b54
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:49:47 2011 +0200
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.20-1].
diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/oracle-rhnsat-selinux
index dad9695..9c3b5c3 100644
--- a/rel-eng/packages/oracle-rhnsat-selinux
+++ b/rel-eng/packages/oracle-rhnsat-selinux
@@ -1 +1 @@
-10.2.0.19-1 selinux/oracle-rhnsat-selinux/
+10.2.0.20-1 selinux/oracle-rhnsat-selinux/
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 6a6e4bf..80eda86 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-rhnsat
Name: oracle-rhnsat-selinux
-Version: 10.2.0.19
+Version: 10.2.0.20
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -116,6 +116,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.20-1
+- fixed typo
+
* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.19-1
- 699979 - allow oracle to write to configuration manager files
commit 960f666846744e330e662bdf6a276fca7a6138b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:48:34 2011 +0200
fixed typo
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
index f328b9b..25dcb38 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
@@ -59,4 +59,4 @@
/var/tmp/.oracle(/.*)? gen_context(user_u:object_r:oracle_tmp_t,s0)
# oracle configuration manager stuff
-/opt/apps/oracle/web/product/(.*/)?/ccr/state(/.*)?' gen_context(system_u:object_r:oracle_dbfile_t,s0)
+/opt/apps/oracle/web/product/(.*/)?ccr/state(/.*)? gen_context(system_u:object_r:oracle_dbfile_t,s0)
commit 230f274f8e56b8351f34286ceabd724b57f4db6e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 3 16:13:20 2011 +0200
some wierd packages have files in iso8859-1 not utf-8
fixing
Execution of /var/www/html/network/software/packages/file_list.pxt failed at Tue May 3 10:17:13 2011: Malformed UTF-8 character (fatal) at (eval 1669) line 1.
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index f8f5bef..d46b6d4 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -238,7 +238,11 @@ class PackageImport(ChannelPackageSubscription):
# Process files too
fileList = package['files']
for f in fileList:
- nv = (f['name'], '')
+ try:
+ filename = f['name'].decode('utf8')
+ except UnicodeDecodeError:
+ filename = f['name'].decode('iso8859-1')
+ nv = (filename, '')
del f['name']
f['capability'] = nv
if not self.capabilities.has_key(nv):
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.18-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.18-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-03 15:40 +0000
Tagging package [spacewalk-java] version [1.5.18-1] in directory [java/].
Changes since spacewalk-config-1.5.3-1:
Milan Zazrivec (1):
682112 - correct displayed systems consuming channel entitlements
Miroslav Suchý (3):
683200 - encode hostname to IDN in BootstrapConfig.do page
683200 - encode hostname to IDN in GeneralConfig.do page
Automatic commit of package [spacewalk-java] release [1.5.18-1].
---
java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java | 6 +
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 9 ++
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 7 +
java/spacewalk-java.spec | 9 ++
rel-eng/packages/spacewalk-java | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 36 ++++++++++
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 6 +
web/modules/sniglets/Sniglets/Lists.pm | 2
8 files changed, 72 insertions(+), 5 deletions(-)
---
13 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 51d819d3d1e0e568243590b2d278bf2ddfe5a195
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 17:40:08 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0b187e8..2378fa3 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.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
@@ -538,6 +538,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.18-1
+- 682112 - correct displayed systems consuming channel entitlements
+- 683200 - encode hostname to IDN in GeneralConfig.do page
+- 683200 - encode hostname to IDN in BootstrapConfig.do page
+- 683200 - encode hostname to IDN in systems/Search.do page
+- 683200 - encode hostname to IDN in DuplicateHostName.do page
+
* Tue May 03 2011 Miroslav Suchý 1.5.17-1
- checkstyle - Line has trailing spaces (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9f99755..3121fdc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.17-1 java/
+1.5.18-1 java/
13 years, 1 month
java/code web/modules
by Milan Zazrivec
java/code/webapp/WEB-INF/pages/channel/entitlements.jsp | 7 ++
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 36 +++++++++++++++
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 6 ++
web/modules/sniglets/Sniglets/Lists.pm | 2
4 files changed, 50 insertions(+), 1 deletion(-)
New commits:
commit 8bc6da18fcc8afaec676670007c9f26042a72c74
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue May 3 17:28:06 2011 +0200
682112 - correct displayed systems consuming channel entitlements
diff --git a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
index 59ae0ad..f81bd41 100644
--- a/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/entitlements.jsp
@@ -43,7 +43,7 @@
${current.currentMembers}
</c:if>
<c:if test="${current.currentMembers > 0}">
- <a href="/network/systems/system_list/in_channel_family.pxt?cfam_id=${current.id}">
+ <a href="/network/systems/system_list/regular_in_channel_family.pxt?cfam_id=${current.id}">
${current.currentMembers}</a>
</c:if>
</rl:column>
@@ -58,7 +58,12 @@
</rl:column>
<rl:column headerkey="entitlements.jsp.subscribed_flex" >
+ <c:if test="${current.currentFlex == 0}">
${current.currentFlex}
+ </c:if>
+ <c:if test="${current.currentFlex > 0}">
+ <a href="/network/systems/system_list/flex_in_channel_family.pxt?cfam_id=${current.id}">${current.currentFlex}</a>
+ </c:if>
</rl:column>
<rl:column headerkey="entitlements.jsp.avaible_flex" >
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 36e32ba..7a581d1 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -901,6 +901,42 @@ ORDER BY UPPER(NVL(X.NAME, '(none)')), X.ID
<elaborator name="entitlements"/>
</mode>
+<mode name="regular_systems_in_channel_family">
+ <query params="org_id, cfam_id, user_id">
+SELECT distinct S.id, S.name
+ FROM rhnServer S,
+ rhnServerChannel SC,
+ rhnChannelFamilyMembers CFM
+ WHERE S.org_id = :org_id
+ AND S.id = SC.server_id
+ AND SC.channel_id = CFM.channel_id
+ AND SC.is_flex = 'N'
+ AND CFM.channel_family_id = :cfam_id
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
+ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ </query>
+ <elaborator name="system_overview" />
+ <elaborator name="entitlements"/>
+</mode>
+
+<mode name="flex_systems_in_channel_family">
+ <query params="org_id, cfam_id, user_id">
+SELECT distinct S.id, S.name
+ FROM rhnServer S,
+ rhnServerChannel SC,
+ rhnChannelFamilyMembers CFM
+ WHERE S.org_id = :org_id
+ AND S.id = SC.server_id
+ AND SC.channel_id = CFM.channel_id
+ AND SC.is_flex = 'Y'
+ AND CFM.channel_family_id = :cfam_id
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
+ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ </query>
+ <elaborator name="system_overview" />
+ <elaborator name="entitlements"/>
+</mode>
+
<mode name="systems_potentially_in_channel_family">
<query params="org_id, cfam_id, user_id">
SELECT S.id, S.name
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index 62d493f..2c59ab4 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -186,6 +186,12 @@ sub _register_modes {
Sniglets::ListView::List->add_mode(-mode => "systems_in_channel_family",
-datasource => RHN::DataSource::System->new);
+ Sniglets::ListView::List->add_mode(-mode => "regular_systems_in_channel_family",
+ -datasource => RHN::DataSource::System->new);
+
+ Sniglets::ListView::List->add_mode(-mode => "flex_systems_in_channel_family",
+ -datasource => RHN::DataSource::System->new);
+
Sniglets::ListView::List->add_mode(-mode => "systems_potentially_in_channel_family",
-datasource => RHN::DataSource::System->new);
diff --git a/web/modules/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index f79f182..f7fa3c2 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -218,6 +218,8 @@ my %pinfo_modes = (
'/inactive.pxt' => {mode => 'inactive', name => 'Inactive Systems'},
'/proxy.pxt' => {mode => 'proxy_servers', name => 'Proxy Servers'},
'/in_channel_family.pxt' => {mode => 'systems_in_channel_family', name => 'Subscribed Systems'},
+ '/flex_in_channel_family.pxt' => {mode => 'flex_systems_in_channel_family', name => 'Subscribed Systems'},
+ '/regular_in_channel_family.pxt' => {mode => 'regular_systems_in_channel_family', name => 'Subscribed Systems'},
'/potentially_in_channel_family.pxt' => {mode => 'systems_potentially_in_channel_family', name => 'Subscribable Systems'},
},
errata => {'/relevant.pxt' => {mode => 'relevant_errata', name => 'Errata Relevant to Your Systems'},
13 years, 1 month
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit e0d234c0dea61fda4f7c992d03705dbf48a76bbc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 15:43:07 2011 +0200
683200 - encode hostname to IDN in GeneralConfig.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
index c655c69..4b713d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -31,6 +31,7 @@ import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
+import java.net.IDN;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
@@ -127,6 +128,9 @@ public class GeneralConfigAction extends BaseConfigAction {
else {
String value = (String)
form.get(translateFormPropertyName(configKey));
+ if (configKey.equals("server.jabber_server")) {
+ value = IDN.toASCII(value);
+ }
csc.updateString(configKey, value);
}
}
@@ -160,6 +164,11 @@ public class GeneralConfigAction extends BaseConfigAction {
translateFormPropertyName("server.satellite.http_proxy_password_confirm"),
configValue);
}
+ else if (configKey.equals("server.jabber_server")) {
+ form.set(
+ translateFormPropertyName("server.jabber_server"),
+ IDN.toUnicode(configValue));
+ }
}
}
}
13 years, 1 month
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d6902867cad5a94f5c91884237d0387812b42f4c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 14:20:18 2011 +0200
683200 - encode hostname to IDN in BootstrapConfig.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
index 6d6f493..1eaee18 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
@@ -30,6 +30,7 @@ import org.apache.struts.action.DynaActionForm;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.net.IDN;
/**
* BootstrapConfigAction - action to handle changing the bootstrap config file options.
@@ -73,7 +74,7 @@ public class BootstrapConfigAction extends BaseConfigAction {
ConfigureBootstrapCommand cmd = (ConfigureBootstrapCommand)
getCommand(requestContext.getCurrentUser());
- cmd.setHostname(form.getString(HOSTNAME));
+ cmd.setHostname(IDN.toASCII(form.getString(HOSTNAME)));
cmd.setSslPath(form.getString(SSL_CERT));
cmd.setEnableSsl((Boolean) form.get(ENABLE_SSL));
cmd.setEnableGpg((Boolean) form.get(ENABLE_GPG));
@@ -96,7 +97,8 @@ public class BootstrapConfigAction extends BaseConfigAction {
}
}
else {
- form.set(HOSTNAME, Config.get().getString(ConfigDefaults.JABBER_SERVER));
+ form.set(HOSTNAME, IDN.toUnicode(
+ Config.get().getString(ConfigDefaults.JABBER_SERVER)));
form.set(SSL_CERT, DEFAULT_CERT_PATH);
form.set(ENABLE_SSL, Boolean.TRUE);
form.set(ENABLE_GPG, Boolean.TRUE);
13 years, 1 month
Changes to 'refs/tags/spacewalk-config-1.5.3-1'
by Jan Pazdziora
Tag 'spacewalk-config-1.5.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-03 12:02 +0000
Tagging package [spacewalk-config] version [1.5.3-1] in directory [spacewalk/config/].
Changes since perl-Satcon-1.18-1:
Jan Pazdziora (2):
We restrict access to some files that were too open in the past (some of them are not tracked by rpm).
Automatic commit of package [spacewalk-config] release [1.5.3-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
---
13 years, 1 month
2 commits - rel-eng/packages spacewalk/config
by Jan Pazdziora
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit a1ad2e8cb79b70d66c07c1acc24f482caaafb4c9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 3 14:02:18 2011 +0200
Automatic commit of package [spacewalk-config] release [1.5.3-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 767f217..5ffc19a 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.5.2-1 spacewalk/config/
+1.5.3-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 5750789..9014100 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.2
+Version: 1.5.3
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -105,6 +105,10 @@ 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 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).
+
* Thu Apr 21 2011 Jan Pazdziora 1.5.2-1
- Explicitly setting attributes of .../rhn-satellite-prep/etc/rhn.
commit 6db056d3b8fcf2df1760628fd2f7136e8d4d4e37
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 3 12:01:52 2011 +0200
We restrict access to some files that were too open in the past (some of them are not tracked by rpm).
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 78e53d6..5750789 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -98,7 +98,11 @@ if [ -f /etc/init.d/satellite-httpd ] ; then
%{__perl} -i -ne 'print unless /satellite-httpd\.pid/' /etc/logrotate.d/httpd
fi
-
+# Set the group to allow Apache to access the conf files ...
+chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini || :
+# ... once we restrict access to some files that were too open in
+# the past.
+chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* || :
%changelog
* Thu Apr 21 2011 Jan Pazdziora 1.5.2-1
13 years, 1 month
Changes to 'refs/tags/perl-Satcon-1.18-1'
by Jan Pazdziora
Tag 'perl-Satcon-1.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-03 12:01 +0000
Tagging package [perl-Satcon] version [1.18-1] in directory [projects/perl-Satcon/].
Changes since spacewalk-java-1.5.17-1:
Jan Pazdziora (2):
Do chgrp apache for files being deployed.
Automatic commit of package [perl-Satcon] release [1.18-1].
Miroslav Suchý (2):
683200 - encode hostname to IDN in DuplicateHostName.do page
683200 - encode hostname to IDN in systems/Search.do page
---
java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 9 +++++++-
java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java | 7 ++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 11 +++++++++-
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 7 ++++++
projects/perl-Satcon/bin/satcon-deploy-tree.pl | 2 +
projects/perl-Satcon/perl-Satcon.spec | 5 +++-
rel-eng/packages/perl-Satcon | 2 -
7 files changed, 39 insertions(+), 4 deletions(-)
---
13 years, 1 month
2 commits - projects/perl-Satcon rel-eng/packages
by Jan Pazdziora
projects/perl-Satcon/bin/satcon-deploy-tree.pl | 2 ++
projects/perl-Satcon/perl-Satcon.spec | 5 ++++-
rel-eng/packages/perl-Satcon | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 0bf2287743abe7ae25429599ccb8730c7d34b964
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 3 14:01:18 2011 +0200
Automatic commit of package [perl-Satcon] release [1.18-1].
diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec
index b9f007b..025d54c 100644
--- a/projects/perl-Satcon/perl-Satcon.spec
+++ b/projects/perl-Satcon/perl-Satcon.spec
@@ -1,6 +1,6 @@
Name: perl-Satcon
Summary: Framework for configuration files
-Version: 1.17
+Version: 1.18
Release: 1%{?dist}
License: GPLv2
Group: Applications/System
@@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%changelog
+* Tue May 03 2011 Jan Pazdziora 1.18-1
+- Do chgrp apache for files being deployed.
+
* Thu Apr 28 2011 Jan Pazdziora 1.17-1
- Do not confuse me by saying Unsubstituted Tags when there are none.
- Do not deploy .orig files.
diff --git a/rel-eng/packages/perl-Satcon b/rel-eng/packages/perl-Satcon
index 8fab2f6..18f8dff 100644
--- a/rel-eng/packages/perl-Satcon
+++ b/rel-eng/packages/perl-Satcon
@@ -1 +1 @@
-1.17-1 projects/perl-Satcon/
+1.18-1 projects/perl-Satcon/
commit bc24e20d7a6bc55c9466fc453b5e4ecd45f780b3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 3 11:36:48 2011 +0200
Do chgrp apache for files being deployed.
diff --git a/projects/perl-Satcon/bin/satcon-deploy-tree.pl b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
index c55a6de..f3eb0da 100755
--- a/projects/perl-Satcon/bin/satcon-deploy-tree.pl
+++ b/projects/perl-Satcon/bin/satcon-deploy-tree.pl
@@ -90,6 +90,8 @@ sub process_file {
# save permissions also but clear access for other
my $mode = (stat("$sourcedir/$relative_path"))[2] & 07770;
chmod $mode, "$destdir/$relative_path";
+ # chgrp apache
+ chown 0, scalar(getgrnam("apache")), "$destdir/$relative_path";
system '/sbin/restorecon', '-vv', "$destdir/$relative_path";
13 years, 1 month
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 9 ++++++++-
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 7 +++++++
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit f7eefed0ea337a932bc9d8ce88950026b4a2962e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 12:10:16 2011 +0200
683200 - encode hostname to IDN in systems/Search.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
index f9fd069..c0e8244 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
-
+import java.net.IDN;
/**
* SystemSearchResult
@@ -162,6 +162,13 @@ public class SystemSearchResult extends SystemOverview {
}
/**
+ * @return the hostname in IDN encoding
+ */
+ public String getDecodedHostname() {
+ return (hostname == null) ? null : IDN.toUnicode(hostname);
+ }
+
+ /**
* @return the description
*/
public String getDescription() {
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index f8cc9d6..2e1787e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -160,6 +160,13 @@
</rhn:highlight>
</rl:column>
</c:when>
+ <c:when test="${view_mode == 'systemsearch_hostname'}">
+ <rl:column bound="false" headerkey="${view_mode}">
+ <rhn:highlight tag="strong" text="${search_string}">
+ ${current.decodedHostname}
+ </rhn:highlight>
+ </rl:column>
+ </c:when>
<c:otherwise>
<rl:column bound="false" headerkey="${view_mode}">
<rhn:highlight tag="strong" text="${search_string}">
13 years, 1 month
java/code
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java | 7 ++++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 11 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 0d6d46f29e666cff294689b471a6a363f83c9077
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 11:48:30 2011 +0200
683200 - encode hostname to IDN in DuplicateHostName.do page
diff --git a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
index 2eab6c9..62634fb 100644
--- a/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
+++ b/java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java
@@ -50,6 +50,13 @@ public class DuplicateSystemGrouping implements Expandable, Identifiable {
}
/**
+ * @param newKey String Set new key
+ */
+ public void setKey(String newKey) {
+ key = newKey;
+ }
+
+ /**
* Add a object to the bucket if there is a match
*
* @param net the object to add
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 f1f9b7b..b80653b 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -87,12 +87,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.ListIterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.net.IDN;
/**
* SystemManager
@@ -2764,8 +2766,15 @@ public class SystemManager extends BaseManager {
* @return List of DuplicateSystemBucket objects
*/
public static List listDuplicatesByHostname(User user, Long inactiveHours) {
- return listDuplicates(user, "duplicate_system_ids_hostname",
+ List<DuplicateSystemGrouping> duplicateSystems = listDuplicates(user,
+ "duplicate_system_ids_hostname",
Collections.EMPTY_LIST, inactiveHours);
+ ListIterator litr = duplicateSystems.listIterator();
+ while (litr.hasNext()) {
+ DuplicateSystemGrouping element = (DuplicateSystemGrouping)litr.next();
+ element.setKey(IDN.toUnicode(element.getKey()));
+ }
+ return duplicateSystems;
}
/**
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.17-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.17-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-03 08:47 +0000
Tagging package [spacewalk-java] version [1.5.17-1] in directory [java/].
Changes since spacewalk-java-1.5.16-1:
Miroslav Suchý (2):
checkstyle - Line has trailing spaces
Automatic commit of package [spacewalk-java] release [1.5.17-1].
---
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years, 1 month
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 80b9c2d2fb42334aa07496cd7293a4f312a0484c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:47:34 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6e0e3ec..0b187e8 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.16
+Version: 1.5.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.17-1
+- checkstyle - Line has trailing spaces (msuchy(a)redhat.com)
+
* Tue May 03 2011 Miroslav Suchý 1.5.16-1
- 673392 - alter channel subscriptions: display flex consumption
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 95ddb50..9f99755 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.16-1 java/
+1.5.17-1 java/
commit f32efb329fa6b7f27f5be2e1790419a4c22868db
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:46:58 2011 +0200
checkstyle - Line has trailing spaces
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 dbc9e92..f1f9b7b 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,7 @@ public class SystemManager extends BaseManager {
// Not free. Check to see if we're a guest, and there are FVEs available.
// Note that for FVEs, NULL == NOT FOUND
if (isServerFveEligible(serverIn)) {
- Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
channelIn);
if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
return true;
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.16-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.5.16-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-03 08:38 +0000
Tagging package [spacewalk-java] version [1.5.16-1] in directory [java/].
Changes since osad-5.10.15-1:
Milan Zazrivec (1):
673392 - alter channel subscriptions: display flex consumption
Miroslav Suchý (4):
code style - '}' should be alone on a line.
code style - Conditional logic can be removed.
checkstyle - Line is longer than 92 characters.
Automatic commit of package [spacewalk-java] release [1.5.16-1].
---
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 10 +
java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java | 16 ++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 74 +++-------
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 26 ++-
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
6 files changed, 75 insertions(+), 58 deletions(-)
---
13 years, 1 month
4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 9 +++------
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4a0705ea4f9eda137987d7eb333efee46ff7ed7a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:38:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 98cf901..6e0e3ec 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.15
+Version: 1.5.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.16-1
+- 673392 - alter channel subscriptions: display flex consumption
+
* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.15-1
- removing unused imports (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1dada0a..95ddb50 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.15-1 java/
+1.5.16-1 java/
commit 18bb9cf274996dff7fbcbce5de7bc030b524a379
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:37:53 2011 +0200
checkstyle - Line is longer than 92 characters.
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 9897e64..dbc9e92 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,8 @@ public class SystemManager extends BaseManager {
// Not free. Check to see if we're a guest, and there are FVEs available.
// Note that for FVEs, NULL == NOT FOUND
if (isServerFveEligible(serverIn)) {
- Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
+ channelIn);
if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
return true;
}
commit 5ab7dad63e0049fc0acfb5205a26d42fe26b9912
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:35:38 2011 +0200
code style - Conditional logic can be removed.
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 fc5c50a..9897e64 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2003,12 +2003,7 @@ public class SystemManager extends BaseManager {
Map params = new HashMap();
params.put("sid", serverIn.getId());
- if (m.execute(params).size() >= 1) {
- return true;
- }
- else {
- return false;
- }
+ return (m.execute(params).size() >= 1);
}
commit 1961c4afbda50d218e0f0f603f6c25c30268761f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:33:35 2011 +0200
code style - '}' should be alone on a line.
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 358d5c1..fc5c50a 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2005,7 +2005,8 @@ public class SystemManager extends BaseManager {
if (m.execute(params).size() >= 1) {
return true;
- } else {
+ }
+ else {
return false;
}
}
13 years, 1 month
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 10 +
java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java | 16 ++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 77 +++-------
java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp | 26 ++-
4 files changed, 73 insertions(+), 56 deletions(-)
New commits:
commit 30f6fe90f434d41d888283166205016b835da4f5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 2 18:26:21 2011 +0200
673392 - alter channel subscriptions: display flex consumption
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
index 3e7f04c..dbde178 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
@@ -76,6 +76,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
public static final String CURRENT_BASE_CHANNEL = "current_base_channel";
public static final String CURRENT_BASE_CHANNEL_ID = "current_base_channel_id";
public static final String NEW_BASE_CHANNEL = "new_base_channel";
+ public static final String SERVER_FVE_ELIGIBLE = "server_fve_eligible";
/** {@inheritDoc} */
@@ -91,6 +92,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
// Setup request attributes
request.setAttribute(RequestContext.SYSTEM, s);
+ request.setAttribute(SERVER_FVE_ELIGIBLE, SystemManager.isServerFveEligible(s));
if (s.getBaseChannel() != null) {
Channel baseChannel = s.getBaseChannel();
List channels = baseChannel.getAccessibleChildrenFor(user);
@@ -107,8 +109,12 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
child.isSubscribable(user.getOrg(), s));
childchannels[i].setAvailableSubscriptions(
- SystemManager.availableSystemChannelSubscriptions(
- s, child, user.getOrg()));
+ ChannelManager.getAvailableEntitlements(
+ user.getOrg(), child));
+
+ childchannels[i].setAvailableFveSubscriptions(
+ ChannelManager.getAvailableFveEntitlements(
+ user.getOrg(), child));
}
request.setAttribute(AVAIL_CHILD_CHANNELS, childchannels);
form.set(NEW_BASE_CHANNEL_ID, s.getBaseChannel().getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
index 1cc9c2e..6e47971 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ChildChannelDto.java
@@ -28,6 +28,7 @@ public class ChildChannelDto {
private boolean isFreeForGuests;
private boolean isSubscribable;
private Long availableSubscriptions;
+ private Long availableFveSubscriptions;
private Long systemCount;
/**
@@ -148,6 +149,21 @@ public class ChildChannelDto {
this.availableSubscriptions = availableSubscriptionsIn;
}
+ /**
+ * @return Returns the availableFveSubscriptions.
+ */
+ public Long getAvailableFveSubscriptions() {
+ return availableFveSubscriptions;
+ }
+
+
+ /**
+ * @param availableFveSubscriptionsIn The availableFveSubscriptions to set.
+ */
+ public void setAvailableFveSubscriptions(Long availableFveSubscriptionsIn) {
+ this.availableFveSubscriptions = availableFveSubscriptionsIn;
+ }
+
/**
* @return Returns the isSubscribable.
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 0513f61..358d5c1 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1992,6 +1992,25 @@ public class SystemManager extends BaseManager {
}
}
+
+ /**
+ * Check if a given Server is FVE eligible
+ * @param serverIn to check
+ * @return true if Server is FVE eligible, false otherwise
+ */
+ public static boolean isServerFveEligible(Server serverIn) {
+ SelectMode m = ModeFactory.getMode("System_queries", "is_server_fve_eligible");
+ Map params = new HashMap();
+ params.put("sid", serverIn.getId());
+
+ if (m.execute(params).size() >= 1) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
/**
* Check to see if an attempt to subscribe the passed in server to the
* passed in channel will succeed. Checks available slots, if the channel is
@@ -2004,64 +2023,28 @@ public class SystemManager extends BaseManager {
*/
public static boolean canServerSubscribeToChannel(Org orgIn, Server serverIn,
Channel channelIn) {
-
if (serverIn.isSubscribed(channelIn)) {
- log.debug("already subscribed. return true");
return true;
}
// If channel is free for this guest, dont check avail subs
if (ChannelManager.isChannelFreeForSubscription(serverIn, channelIn)) {
- log.debug("its a free channel for this server, returning true");
return true;
}
- Long availableSubscriptions = availableSystemChannelSubscriptions(serverIn,
- channelIn, orgIn);
-
- if (availableSubscriptions != null && (availableSubscriptions.longValue() < 1)) {
- log.debug("avail subscriptions is to small : " + availableSubscriptions);
- return false;
- }
- log.debug("canServerSubscribeToChannel true!");
- return true;
- }
-
- /**
- * For given Server, Channel and Org return number of available subscriptions
- * @param serverIn Server to check
- * @param channelIn Channel to check
- * @param orgIn Org to check
- * @return number of subscriptions available
- */
- public static Long availableSystemChannelSubscriptions(Server serverIn,
- Channel channelIn, Org orgIn) {
- SelectMode m = ModeFactory.getMode("System_queries", "is_server_fve_eligible");
- Map params = new HashMap();
- params.put("sid", serverIn.getId());
-
- Long availableSubscriptions = null;
-
- /* Check if the channel is consumable for free */
- if (ChannelManager.isChannelFreeForSubscription(serverIn, channelIn)) {
- return availableSubscriptions;
- }
-
- /* If serverIn is fve eligible, check number of flex guest entitlements available */
- if (m.execute(params).size() >= 1) {
- availableSubscriptions =
- ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
- }
-
- /* If the previous query did not result any data or the number of flex guest
- * subscriptions is zero, check number of regular entitlements available
- */
- if ((availableSubscriptions == null) || (availableSubscriptions.longValue() < 1)) {
- availableSubscriptions = ChannelManager.getAvailableEntitlements(orgIn,
- channelIn);
+ // Not free. Check to see if we're a guest, and there are FVEs available.
+ // Note that for FVEs, NULL == NOT FOUND
+ if (isServerFveEligible(serverIn)) {
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
+ return true;
+ }
}
- return availableSubscriptions;
+ // Finally, check available physical subs
+ // Note that for PHYS SUBS, NULL == UNLIMITED
+ Long availableSubs = ChannelManager.getAvailableEntitlements(orgIn, channelIn);
+ return ((availableSubs == null) || (availableSubs.longValue() > 0));
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
index 6ed6023..45426a2 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/channels.jsp
@@ -44,15 +44,27 @@
<c:if test="${not channel.subscribed}">
<input ${disabledChannel} name="child_channel" value="${channel.id}" type="checkbox" id="unchecked">
</c:if>
- <c:if test="${not channel.freeForGuests && system.virtualGuest && channel.availableSubscriptions != null}">
- <span class="asterisk">* </span>
- </c:if>
<a href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">${channel.name}</a>
- <c:if test="${channel.availableSubscriptions != null}">
- (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ <c:if test="${system.virtualGuest}">
+ <c:if test="${not channel.freeForGuests}">
+ <span class="asterisk">* </span>
+ </c:if>
+ <c:choose>
+ <c:when test="${channel.freeForGuests && system.virtualInstance.hostSystem != null}">
+ (<bean:message key="sdc.channels.edit.unlimited"/>)
+ </c:when>
+
+ <c:when test="${server_fve_eligible && channel.availableFveSubscriptions > 0}">
+ (<strong>${channel.availableFveSubscriptions}</strong> flex <bean:message key="sdc.channels.edit.available"/>)
+ </c:when>
+
+ <c:otherwise>
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
+ </c:otherwise>
+ </c:choose>
</c:if>
- <c:if test="${channel.availableSubscriptions == null}">
- (<bean:message key="sdc.channels.edit.unlimited"/>)
+ <c:if test="${not system.virtualGuest}">
+ (<strong>${channel.availableSubscriptions}</strong> <bean:message key="sdc.channels.edit.available"/>)
</c:if>
</li>
</c:forEach>
13 years, 1 month
Changes to 'refs/tags/osad-5.10.15-1'
by Jan Pazdziora
Tag 'osad-5.10.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:05 +0000
Tagging package [osad] version [5.10.15-1] in directory [client/tools/osad/].
Changes since SatConfig-generator-2.29.13-1:
Jan Pazdziora (3):
Revert "bump up epoch, and match version of osad with spacewalk version".
Bumping up version to get above the one we backported to Spacewalk 1.4.
Automatic commit of package [osad] release [5.10.15-1].
---
client/tools/osad/osad.spec | 9 +++++++--
rel-eng/packages/osad | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
---
13 years, 1 month
2 commits - client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 8 +++++++-
rel-eng/packages/osad | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6dee6f4da5665fd95d31ded13048af6ac8d523f1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:05:52 2011 +0200
Automatic commit of package [osad] release [5.10.15-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 50b6dda..dd6a92f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -275,6 +275,12 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon May 02 2011 Jan Pazdziora 5.10.15-1
+- Bumping up version to get above the one we backported to Spacewalk 1.4.
+- Revert "bump up epoch, and match version of osad with spacewalk version".
+- bump up epoch, and match version of osad with spacewalk version
+ (msuchy(a)redhat.com)
+
* Fri Apr 15 2011 Jan Pazdziora 5.10.12-1
- require python-hashlib only on rhel and rhel <= 5 (mc(a)suse.de)
- build osad on SUSE (mc(a)suse.de)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f8c8954..d950679 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.12-1 client/tools/osad/
+5.10.15-1 client/tools/osad/
commit bb27126c682f28b965f0afe9fa291fa529072d50
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:05:29 2011 +0200
Bumping up version to get above the one we backported to Spacewalk 1.4.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index faf044f..50b6dda 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.12
+Version: 5.10.15
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
13 years, 1 month
client/tools
by Jan Pazdziora
client/tools/osad/osad.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2d98da788ce83399b878c595a4e98b9fc8d14708
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:03:58 2011 +0200
Revert "bump up epoch, and match version of osad with spacewalk version".
No need to make our life harder by setting the epoch.
This reverts commit c0bdfc3dbfe13ed73a0b0307de9bddb32a845ffa.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 38fbb51..faf044f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,8 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Epoch: 1
-Version: 1.5.0
+Version: 5.10.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
13 years, 1 month
Changes to 'refs/tags/SatConfig-generator-2.29.13-1'
by Jan Pazdziora
Tag 'SatConfig-generator-2.29.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:01 +0000
Tagging package [SatConfig-generator] version [2.29.13-1] in directory [monitoring/SatConfig/generator/].
Changes since spacewalk-web-1.5.5-1:
Jan Pazdziora (1):
Automatic commit of package [SatConfig-generator] release [2.29.13-1].
---
monitoring/SatConfig/generator/SatConfig-generator.spec | 7 ++++++-
rel-eng/packages/SatConfig-generator | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 1 month
monitoring/SatConfig rel-eng/packages
by Jan Pazdziora
monitoring/SatConfig/generator/SatConfig-generator.spec | 7 ++++++-
rel-eng/packages/SatConfig-generator | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit de57d70c7b9615b954b4cd6a9bdd94a8bd3ac16d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:01:20 2011 +0200
Automatic commit of package [SatConfig-generator] release [2.29.13-1].
diff --git a/monitoring/SatConfig/generator/SatConfig-generator.spec b/monitoring/SatConfig/generator/SatConfig-generator.spec
index 8bb820f..db68593 100644
--- a/monitoring/SatConfig/generator/SatConfig-generator.spec
+++ b/monitoring/SatConfig/generator/SatConfig-generator.spec
@@ -2,7 +2,7 @@
%define install_prefix %{perl_vendorlib}/NOCpulse/SatConfig
Name: SatConfig-generator
-Version: 2.29.12
+Version: 2.29.13
Release: 1%{?dist}
Summary: Satellite Configuration System - Server
URL: https://fedorahosted.org/spacewalk
@@ -54,6 +54,11 @@ install -m 644 GenerateConfig.pm $RPM_BUILD_ROOT%{install_prefix}
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 02 2011 Jan Pazdziora 2.29.13-1
+- No need to Disconnect, hopefully.
+- Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses
+ RHN::DB, the column name is now uppercase.
+
* Fri Oct 08 2010 Jan Pazdziora 2.29.12-1
- Since the package SatConfig-dbsynch is gone, remove dependencies that were
requiring it.
diff --git a/rel-eng/packages/SatConfig-generator b/rel-eng/packages/SatConfig-generator
index a7c79e5..f1663c4 100644
--- a/rel-eng/packages/SatConfig-generator
+++ b/rel-eng/packages/SatConfig-generator
@@ -1 +1 @@
-2.29.12-1 monitoring/SatConfig/generator/
+2.29.13-1 monitoring/SatConfig/generator/
13 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.5.5-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 15:00 +0000
Tagging package [spacewalk-web] version [1.5.5-1] in directory [web/].
Changes since spacewalk-backend-1.5.14-1:
Jan Pazdziora (4):
Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses RHN::DB, the column name is now uppercase.
Fixing set_err invocation to match the prototype.
No need to Disconnect, hopefully.
Automatic commit of package [spacewalk-web] release [1.5.5-1].
---
monitoring/SatConfig/generator/GenerateConfig.pm | 6 ++----
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB.pm | 4 ++--
web/spacewalk-web.spec | 5 ++++-
4 files changed, 9 insertions(+), 8 deletions(-)
---
13 years, 1 month
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 81d5c5984d51fc4c5d87c1e1bd9bd071b654d802
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 17:00:42 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 2072ebd..c26a373 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.4-1 web/
+1.5.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 0369162..bc01a03 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.4
+Version: 1.5.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon May 02 2011 Jan Pazdziora 1.5.5-1
+- Fixing set_err invocation to match the prototype.
+
* Mon May 02 2011 Jan Pazdziora 1.5.4-1
- Patch to run remote commands on multiple machines on Spacewalk 1.4
PostgreSQL. (Ville.Salmela(a)csc.fi)
13 years, 1 month
monitoring/SatConfig
by Jan Pazdziora
monitoring/SatConfig/generator/GenerateConfig.pm | 2 --
1 file changed, 2 deletions(-)
New commits:
commit 44acf2b910e18accbe58e5d03f3c328009ad9501
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:57:56 2011 +0200
No need to Disconnect, hopefully.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: RHN::Exception: DBD::Oracle::db set_err failed: Can't disconnect cache-loaded RHN::DB handle
diff --git a/monitoring/SatConfig/generator/GenerateConfig.pm b/monitoring/SatConfig/generator/GenerateConfig.pm
index 1c27509..f7c77c7 100644
--- a/monitoring/SatConfig/generator/GenerateConfig.pm
+++ b/monitoring/SatConfig/generator/GenerateConfig.pm
@@ -107,7 +107,6 @@ sub synch_nolog {
my ($customer_id, $sat_cluster_id) = @_;
# Log in to the nolog instance
- NOCpulse::DBRecord->Disconnect();
CSDBRecord->DatabaseConnection();
my $sth;
@@ -153,7 +152,6 @@ sub synch_nolog {
} else {
CSDBRecord->DatabaseConnection->commit();
}
- NOCpulse::DBRecord->Disconnect();
return $msg;
}
13 years, 1 month
2 commits - monitoring/SatConfig web/modules
by Jan Pazdziora
monitoring/SatConfig/generator/GenerateConfig.pm | 4 ++--
web/modules/rhn/RHN/DB.pm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4a855ee10d5dd0527691dacec424896048563c5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:40:35 2011 +0200
Fixing set_err invocation to match the prototype.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: DBI set_err: invalid number of arguments: got handle + 1, expected handle + between 2 and 5
Usage: $h->set_err($err, $errmsg [, $state, $method, $rv]) at /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm line 373.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 6c60b7c..10337ff 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -370,7 +370,7 @@ sub disconnect {
my $dbh = shift;
if ($dbh->{private_from_cache}) {
- $dbh->set_err("Can't disconnect cache-loaded RHN::DB handle");
+ $dbh->set_err(99999, "Can't disconnect cache-loaded RHN::DB handle");
}
else {
$dbh->SUPER::disconnect(@_);
@@ -533,7 +533,7 @@ sub execute_h {
my $self = shift;
my @params = @_;
- $self->set_err("Odd number of params to execute_h") if @params % 2;
+ $self->set_err(99998, "Odd number of params to execute_h") if @params % 2;
while (my ($k, $v) = (splice @params, 0, 2, ())) {
commit dd69d8fe96a1337a65d8d645f9ecd0d9b05342d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:37:19 2011 +0200
Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses RHN::DB, the column name is now uppercase.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: Message SatClusterRecord::get_physical_location_name() not understood
TRACEBACK:
at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 443
NOCpulse::Object::doesNotUnderstand('SatClusterRecord=HASH(0x2aae515d6fc0)', 'SatClusterRecord', 'get_physical_location_name') called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 463
NOCpulse::Object::AUTOLOAD('SatClusterRecord=HASH(0x2aae515d6fc0)') called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 44
eval {...} called at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 19
NOCpulse::SatConfig::GenerateConfig::handler('Apache2::RequestRec=SCALAR(0x2aae5a006a50)') called at -e line 0
eval {...} called at -e line 0
diff --git a/monitoring/SatConfig/generator/GenerateConfig.pm b/monitoring/SatConfig/generator/GenerateConfig.pm
index 46e2b66..1c27509 100644
--- a/monitoring/SatConfig/generator/GenerateConfig.pm
+++ b/monitoring/SatConfig/generator/GenerateConfig.pm
@@ -24,7 +24,7 @@ sub handler {
SatClusterRecord->LoadFromSqlWithBind(q{
select sat_cluster.recid, sat_cluster.customer_id,
- location_name "physical_location_name",
+ location_name as physical_location_name,
sat_node.max_concurrent_checks, sat_node.sched_log_level,
sat_node.sput_log_level, sat_node.dq_log_level
from sat_cluster, sat_node, physical_location
@@ -41,7 +41,7 @@ sub handler {
my $satCluster = SatClusterRecord->InstancesList->[0];
my $customerId = $satCluster->get_CUSTOMER_ID;
- my $location = $satCluster->get_physical_location_name;
+ my $location = $satCluster->get_PHYSICAL_LOCATION_NAME;
# Get the auto_update flag
CFDBRecord->LoadFromSqlWithBind(q{
13 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.5.14-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-02 14:00 +0000
Tagging package [spacewalk-backend] version [1.5.14-1] in directory [backend/].
Changes since yum-rhn-plugin-1.5.6-1:
Michael Mraka (3):
force version and release to be a string
701297 - don't try to read rpm header from mpm package
Automatic commit of package [spacewalk-backend] release [1.5.14-1].
---
backend/server/handlers/app/packages.py | 4 ++--
backend/server/importlib/packageImport.py | 4 +++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
---
13 years, 1 month
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8757743f53642b95afc451b7e4cbe3ef68a8948f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 16:00:30 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e5ff4ea..01a5bb7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.13
+Version: 1.5.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -679,6 +679,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
+- 701297 - don't try to read rpm header from mpm package
+
* Mon May 02 2011 Jan Pazdziora 1.5.13-1
- Method reload_packages not used in our code, removing.
- Removal of ReleaseChannelMapImport makes processReleaseChannelMap unused,
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 30d48b1..60cc880 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.13-1 backend/
+1.5.14-1 backend/
13 years, 1 month
2 commits - backend/server
by Michael Mraka
backend/server/handlers/app/packages.py | 4 ++--
backend/server/importlib/packageImport.py | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b561351b9a9e02fc4c279198462cd4e21ac0d733
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 15:53:27 2011 +0200
701297 - don't try to read rpm header from mpm package
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index effd477..f8f5bef 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -21,6 +21,7 @@ import os.path
from importLib import GenericPackageImport, IncompletePackage, \
Import, InvalidArchError, InvalidChannelError, \
IncompatibleArchError
+from mpmSource import mpmBinaryPackage
from spacewalk.common import rhn_pkg
from spacewalk.common.rhnConfig import CFG
from spacewalk.server import taskomatic
@@ -481,7 +482,8 @@ class PackageImport(ChannelPackageSubscription):
def _import_signatures(self):
for package in self.batch:
- if package['path']:
+ # skip missing files and mpm packages
+ if package['path'] and not isinstance(package, mpmBinaryPackage):
full_path = os.path.join(CFG.MOUNT_POINT, package['path'])
if os.path.exists(full_path):
header = rhn_pkg.get_package_header(filename=full_path)
commit b8e79b43306d0a80ac5130870a1b0521a24e1db0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sun May 1 22:07:32 2011 +0200
force version and release to be a string
fixing
operator does not exist: character varying = integer
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index e3aa1b1..7b24bb1 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -509,8 +509,8 @@ class Packages(RPC_Base):
query_args = {
'pkg_name': pkg_info['name'],
'pkg_epoch': pkg_epoch,
- 'pkg_version': pkg_info['version'],
- 'pkg_rel': pkg_info['release'],
+ 'pkg_version': str(pkg_info['version']),
+ 'pkg_rel': str(pkg_info['release']),
'pkg_arch': pkg_info['arch'],
'orgid': org_id,
}
13 years, 1 month
Changes to 'refs/tags/yum-rhn-plugin-1.5.6-1'
by Miroslav Suchý
Tag 'yum-rhn-plugin-1.5.6-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-02 12:31 +0000
Tagging package [yum-rhn-plugin] version [1.5.6-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-java-1.5.15-1:
Miroslav Suchý (3):
proxy_dict is private attribute
set proxy_dict only if we have some proxy
Automatic commit of package [yum-rhn-plugin] release [1.5.6-1].
---
client/rhel/yum-rhn-plugin/rhnplugin.py | 11 ++++++-----
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
---
13 years, 1 month
3 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/yum-rhn-plugin/rhnplugin.py | 11 ++++++-----
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 833dce50e1aa0b32adb64ae2557a756050186b2a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 2 14:31:46 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.5.6-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 9b7471c..a799606 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,10 @@ fi
%doc LICENSE
%changelog
+* Mon May 02 2011 Miroslav Suchý 1.5.6-1
+- set proxy_dict only if we have some proxy
+- proxy_dict is private attribute
+
* Fri Apr 29 2011 Miroslav Suchý 1.5.5-1
- code cleanup
- 691283 - create persistdir in _repos_persistdir instead of PWD
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 4f74e89..5d65323 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.5.5-1 client/rhel/yum-rhn-plugin/
+1.5.6-1 client/rhel/yum-rhn-plugin/
commit e63847b2665552a364977f507da6ca62303009c1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 2 14:28:36 2011 +0200
set proxy_dict only if we have some proxy
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 44c7f55..f7c99b6 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -107,10 +107,11 @@ def prereposetup_hook(conduit):
proxy_dict = {}
try:
proxy_url = get_proxy_url(up2date_cfg)
- if up2date_cfg['useNoSSLForPackages']:
- proxy_dict = {'HTTP' : proxy_url}
- else:
- proxy_dict = {'HTTPS' : proxy_url}
+ if proxy_url:
+ if up2date_cfg['useNoSSLForPackages']:
+ proxy_dict = {'HTTP' : proxy_url}
+ else:
+ proxy_dict = {'HTTPS' : proxy_url}
except BadProxyConfig:
rhn_enabled = False
PROXY_ERROR = _("There was an error parsing the RHN proxy settings.")
commit c9b73294699cb2c7caf8db0e11e8d49d36d225e1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 2 14:27:23 2011 +0200
proxy_dict is private attribute
addressing:
Loaded plugins: rhnplugin, security
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in ?
yummain.user_main(sys.argv[1:], exit_code=True)
File "/usr/share/yum-cli/yummain.py", line 309, in user_main
errcode = main(args)
File "/usr/share/yum-cli/yummain.py", line 178, in main
result, resultmsgs = base.doCommands()
File "/usr/share/yum-cli/cli.py", line 345, in doCommands
self._getTs(needTsRemove)
File "/usr/lib/python2.4/site-packages/yum/depsolve.py", line 101, in _getTs
self._getTsInfo(remove_only)
File "/usr/lib/python2.4/site-packages/yum/depsolve.py", line 112, in _getTsInfo
pkgSack = self.pkgSack
File "/usr/lib/python2.4/site-packages/yum/__init__.py", line 662, in <lambda>
pkgSack = property(fget=lambda self: self._getSacks(),
File "/usr/lib/python2.4/site-packages/yum/__init__.py", line 502, in _getSacks
self.repos.populateSack(which=repos)
File "/usr/lib/python2.4/site-packages/yum/repos.py", line 232, in populateSack
self.doSetup()
File "/usr/lib/python2.4/site-packages/yum/repos.py", line 64, in doSetup
self.ayum.plugins.run('prereposetup')
File "/usr/lib/python2.4/site-packages/yum/plugins.py", line 179, in run
func(conduitcls(self, self.base, conf, **kwargs))
File "/usr/share/yum-plugins/rhnplugin.py", line 184, in prereposetup_hook
repo.proxy_dict = proxy_dict
AttributeError: can't set attribute
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 89df90a..44c7f55 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -181,7 +181,7 @@ def prereposetup_hook(conduit):
repo.sslcacert = sslcacert
repo.enablegroups = enablegroups
repo.metadata_expire = metadata_expire
- repo.proxy_dict = proxy_dict
+ repo._proxy_dict = proxy_dict
if hasattr(conduit.getConf(), '_repos_persistdir'):
repo.base_persistdir = conduit.getConf()._repos_persistdir
repoOptions = getRHNRepoOptions(conduit, repo.id)
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.15-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.15-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-02 11:38 +0000
Tagging package [spacewalk-java] version [1.5.15-1] in directory [java/].
Changes since spacewalk-java-1.5.14-1:
Tomas Lestach (2):
removing unused imports
Automatic commit of package [spacewalk-java] release [1.5.15-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 2 --
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
---
13 years, 1 month
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 eb28db9388d84ee61ec5a607530a9c42f1fafe03
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 2 13:38:22 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.15-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2f55780..98cf901 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.14
+Version: 1.5.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.15-1
+- removing unused imports (tlestach(a)redhat.com)
+
* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.14-1
- 659138 - set start time for skipped queue jobs (tlestach(a)redhat.com)
- 659138 - style id support for repeat-task-picker (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2e092b6..1dada0a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.14-1 java/
+1.5.15-1 java/
13 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java | 2 --
1 file changed, 2 deletions(-)
New commits:
commit fc4a64b01c4ff711384e1b419b2c47f533290282
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 2 13:26:11 2011 +0200
removing unused imports
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
index 6190147..e9ec2ef 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RpmRepositoryWriter.java
@@ -26,8 +26,6 @@ import java.security.DigestInputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.5.14-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.14-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-02 10:04 +0000
Tagging package [spacewalk-java] version [1.5.14-1] in directory [java/].
Changes since spacewalk-web-1.5.4-1:
Tomas Lestach (4):
659138 - introduce WebUI interface for taskomatic schedule management
659138 - style id support for repeat-task-picker
659138 - set start time for skipped queue jobs
Automatic commit of package [spacewalk-java] release [1.5.14-1].
---
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 91 +++
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 107 ++++
java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java | 65 ++
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 194 ++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 24
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 242 ++++++++++
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 36 +
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 36 +
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 124 +++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 74 +++
java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp | 66 ++
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 128 +++++
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 57 ++
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 49 --
java/code/webapp/WEB-INF/struts-config.xml | 50 +-
java/spacewalk-java.spec | 8
rel-eng/packages/spacewalk-java | 2
21 files changed, 1342 insertions(+), 30 deletions(-)
---
13 years, 1 month
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 5317e5bb4927a8095de17dcc3d1e49b71ae5a199
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon May 2 12:04:41 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.14-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e767daf..2f55780 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.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
@@ -538,6 +538,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.14-1
+- 659138 - set start time for skipped queue jobs (tlestach(a)redhat.com)
+- 659138 - style id support for repeat-task-picker (tlestach(a)redhat.com)
+- 659138 - introduce WebUI interface for taskomatic schedule management
+ (tlestach(a)redhat.com)
+
* Sat Apr 30 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.13-1
- Remove the static comps file mapping for RHEL 5.0 trees (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4ec78ab..2e092b6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.13-1 java/
+1.5.14-1 java/
13 years, 1 month
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 91 +++
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 107 ++++
java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java | 65 ++
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 194 ++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 24
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 242 ++++++++++
java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java | 36 +
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml | 4
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 36 +
java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java | 124 +++++
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 74 +++
java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp | 66 ++
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 128 +++++
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 57 ++
java/code/webapp/WEB-INF/pages/common/fragments/repeat-task-picker.jspf | 49 --
java/code/webapp/WEB-INF/struts-config.xml | 50 +-
19 files changed, 1334 insertions(+), 28 deletions(-)
New commits:
commit 101b4b425e8839f5006c0c4fa356d55a51ecc410
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 29 13:12:13 2011 +0200
659138 - set start time for skipped queue jobs
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
index 8048fa0..ceae63e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
@@ -115,7 +115,9 @@ public class TaskoRun {
* if task execution will be skipped (used for queue tasks)
*/
public void skipped() {
- setEndTime(new Date());
+ Date now = new Date();
+ setStartTime(now);
+ setEndTime(now);
setStatus(STATUS_SKIPPED);
}
commit 9bd27dab18ff55e535282e080588c2e858201bdd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 29 17:32:08 2011 +0200
659138 - style id support for repeat-task-picker
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 5d56ac0..4ac0c85 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
@@ -10,21 +10,23 @@
-<input type="radio" name="${picker.name}_status" value="disabled"
- <c:if test="${picker.status == 'disabled'}">checked="true"</c:if> />
- <bean:message key="schedule.disabled"/>
+<input type="radio" name="${picker.name}_status" value="disabled" id="disabled"
+ <c:if test="${picker.status == 'disabled'}">checked="true"</c:if> />
+ <label for="disabled"><bean:message key="schedule.disabled"/></label>
<br/>
-<input type="radio" name="${picker.name}_status" value="daily" <c:if test="${picker.status == 'daily'}">checked="true"</c:if> />
- <bean:message key="schedule.daily"/>:
+<input type="radio" name="${picker.name}_status" value="daily" id="daily"
+<c:if test="${picker.status == 'daily'}">checked="true"</c:if> />
+ <label for="daily"><bean:message key="schedule.daily"/>:
<c:set var="timeName" value="daily" />
<%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
-
+ </label>
<br/>
-<input type="radio" name="${picker.name}_status" value="weekly" <c:if test="${picker.status == 'weekly'}">checked="true"</c:if> />
- <bean:message key="schedule.weekly"/>:
+<input type="radio" name="${picker.name}_status" value="weekly" id="weekly"
+<c:if test="${picker.status == 'weekly'}">checked="true"</c:if> />
+ <label for="weekly"><bean:message key="schedule.weekly"/>:
<bean:message key="schedule.weekly.every"/>
<select name='${picker.name}_day_week' size="1">
<c:forEach var="day" begin="0" end="6">
@@ -36,33 +38,30 @@
<c:set var="timeName" value="weekly" />
<%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
-
-
-
-
+ </label>
<br/>
-<input type="radio" name="${picker.name}_status" value="monthly" <c:if test="${picker.status == 'monthly'}">checked="true"</c:if> />
- <bean:message key="schedule.monthly"/>:
+<input type="radio" name="${picker.name}_status" value="monthly" id="monthly"
+<c:if test="${picker.status == 'monthly'}">checked="true"</c:if> />
+ <label for="monthly"><bean:message key="schedule.monthly"/>:
- <bean:message key="schedule.monthly.day"/>
+ <bean:message key="schedule.monthly.day"/>
<select name='${picker.name}_day_month' size="1">
<c:forEach var="day" begin="1" end="28">
- <option <c:if test="${picker.dayOfMonthLong == day}">selected="selected"</c:if> value='${day}'>${day}</option>
+ <option <c:if test="${picker.dayOfMonthLong == day}">selected="selected"</c:if> value='${day}'>${day}</option>
</c:forEach>
- </select>
- <bean:message key="schedule.weekly.at"/>
- <c:set var="timeName" value="monthly" />
+ </select>
+ <bean:message key="schedule.weekly.at"/>
+ <c:set var="timeName" value="monthly" />
<%@ include file="/WEB-INF/pages/common/fragments/hour-minute-picker.jspf" %>
-
-
-
+ </label>
<br/>
-
-<input type="radio" name="${picker.name}_status" value="cron" <c:if test="${picker.status == 'cron'}">checked="true"</c:if> />
- <bean:message key="schedule.cron"/>:
+<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>
commit eaf6ae607fdf17541c72ae02218fa9c66ce61660
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 6 17:18:48 2011 +0200
659138 - introduce WebUI interface for taskomatic schedule management
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
new file mode 100644
index 0000000..2bf580e
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -0,0 +1,91 @@
+/**
+ * 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.action.tasko;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.taskomatic.TaskomaticApi;
+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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * BunchDetailAction
+ * @version $Rev$
+ */
+public class BunchDetailAction extends RhnAction implements Listable {
+
+ public static final String LIST_NAME = "runList";
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ RequestContext ctx = new RequestContext(request);
+ User loggedInUser = ctx.getLoggedInUser();
+ String bunchLabel = request.getParameter("label");
+ 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 {
+ new TaskomaticApi().scheduleSingleSatBunch(loggedInUser, bunchLabel);
+ createSuccessMessage(request, "message.bunch.singlescheduled", bunchLabel);
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
+ }
+
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext contextIn) {
+ User user = contextIn.getLoggedInUser();
+ String bunchName = contextIn.getParam("label", true);
+ try {
+ List<Map> runs = new TaskomaticApi().findRunsByBunch(user, bunchName);
+ return runs;
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(contextIn.getRequest(),
+ "repos.jsp.message.taskomaticdown", null);
+ return new ArrayList();
+ }
+ }
+}
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
new file mode 100644
index 0000000..c9f4a7c
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
@@ -0,0 +1,107 @@
+/**
+ * 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.action.tasko;
+
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.taskomatic.TaskomaticApi;
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * DeleteScheduleAction
+ * @version $Rev$
+ */
+public class DeleteScheduleAction extends RhnAction {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ RequestContext ctx = new RequestContext(request);
+ User loggedInUser = ctx.getLoggedInUser();
+
+ if (ctx.hasParam("schid")) {
+ Long scheduleId = ctx.getParamAsLong(("schid"));
+ TaskomaticApi tapi = new TaskomaticApi();
+ Map schedule = new HashMap();
+ try {
+ schedule = tapi.lookupScheduleById(loggedInUser, scheduleId);
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "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);
+ }
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"),
+ request.getParameterMap());
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+
+ }
+ }
+ }
+ else {
+ createErrorMessage(request, "message.schedulenotactive", scheduleName);
+ }
+ }
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"),
+ request.getParameterMap());
+ }
+
+ private Boolean isActive(Map schedule) {
+ Date till = (Date) schedule.get("active_till");
+ if (till == null) {
+ return Boolean.TRUE;
+ }
+ Date now = new Date();
+ return now.before(till);
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java
new file mode 100644
index 0000000..f908ba4
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java
@@ -0,0 +1,65 @@
+/**
+ * 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.action.tasko;
+
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.taskomatic.TaskomaticApi;
+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 java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * SatSchedulesAction
+ * @version $Rev$
+ */
+public class SatSchedulesAction extends RhnAction implements Listable {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext contextIn) {
+ User user = contextIn.getLoggedInUser();
+ try {
+ return new TaskomaticApi().findActiveSchedules(user);
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(contextIn.getRequest(),
+ "repos.jsp.message.taskomaticdown", null);
+ return new ArrayList();
+ }
+ }
+}
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
new file mode 100644
index 0000000..ddac2ff
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -0,0 +1,194 @@
+/**
+ * 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.action.tasko;
+
+import com.redhat.rhn.common.util.RecurringEventPicker;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.taskomatic.TaskomaticApi;
+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.DynaActionForm;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * ScheduleDetailAction
+ * @version $Rev$
+ */
+public class ScheduleDetailAction extends RhnAction {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ DynaActionForm form = (DynaActionForm)formIn;
+ Map params = makeParamMap(request);
+ RequestContext ctx = new RequestContext(request);
+ User loggedInUser = ctx.getLoggedInUser();
+ Long scheduleId = ctx.getParamAsLong(("schid"));
+
+ if (ctx.hasParam("schid")) {
+ params.put("schid", scheduleId);
+ Map schedule = new HashMap();
+ try {
+ schedule = new TaskomaticApi().lookupScheduleById(loggedInUser, scheduleId);
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
+ String scheduleName = (String) schedule.get("job_label");
+ String bunchName = (String) schedule.get("bunch");
+ request.setAttribute("schedulename", scheduleName);
+ form.set("schedulename", scheduleName);
+ request.setAttribute("bunch", bunchName);
+ Boolean active = isActive(schedule);
+ request.setAttribute("active", active);
+ if (!active) {
+ request.setAttribute("activetill", schedule.get("active_till"));
+ }
+ }
+
+ if (!isSubmitted(form)) {
+ setupForm(request, form);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"),
+ request.getParameterMap());
+ }
+
+ RecurringEventPicker picker = RecurringEventPicker.prepopulatePicker(
+ request, "date", null);
+
+ if (picker.isDisabled()) {
+ if (scheduleId == null) {
+ prepDropdowns(ctx);
+ createErrorMessage(request, "message.scheduledisabled", null);
+
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
+ }
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("disable"), params);
+ }
+
+ String scheduleName = form.getString("schedulename");
+ String bunchName = form.getString("bunch");
+
+ try {
+ TaskomaticApi tapi = new TaskomaticApi();
+ tapi.scheduleSatBunch(loggedInUser,
+ scheduleName,
+ bunchName,
+ picker.getCronEntry()
+ );
+ if (ctx.hasParam("create_button")) {
+ createSuccessMessage(request, "message.schedulecreated", scheduleName);
+ }
+ else {
+ createSuccessMessage(request, "message.scheduleupdated", scheduleName);
+ }
+ Map schedule = tapi.lookupScheduleByBunchAndLabel(loggedInUser, bunchName,
+ scheduleName);
+ params.put("schid", schedule.get("id"));
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"), params);
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("default"), params);
+ }
+ }
+
+ private Boolean isActive(Map schedule) {
+ Date till = (Date) schedule.get("active_till");
+ if (till == null) {
+ return Boolean.TRUE;
+ }
+ Date now = new Date();
+ return now.before(till);
+ }
+
+ 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) {
+ try {
+ TaskomaticApi tapi = new TaskomaticApi();
+ Map schedule = tapi.lookupScheduleById(loggedInUser, schid);
+ String scheduleName = (String) schedule.get("job_label");
+ String bunchName = (String) schedule.get("bunch");
+ request.setAttribute("schedulename", scheduleName);
+ form.set("schedulename", scheduleName);
+ request.setAttribute("bunch", bunchName);
+ Map bunch = tapi.lookupBunchByName(loggedInUser, bunchName);
+ request.setAttribute("bunchdescription", (String)bunch.get("description"));
+ RecurringEventPicker.prepopulatePicker(request, "date",
+ (String) schedule.get(("cron_expr")));
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(request,
+ "repos.jsp.message.taskomaticdown", null);
+ }
+ }
+ else {
+ RecurringEventPicker.prepopulatePicker(request, "date", null);
+ }
+ }
+
+ private void prepDropdowns(RequestContext ctx) {
+ User loggedInUser = ctx.getLoggedInUser();
+ // populate parent base channels
+ List dropDown = new ArrayList();
+ try {
+ List<Map> bunches = new TaskomaticApi().listSatBunchSchedules(loggedInUser);
+
+ for (Map b : bunches) {
+ addOption(dropDown, (String)b.get("name"), (String)b.get("name"));
+ }
+ }
+ catch (TaskomaticApiException e) {
+ createErrorMessage(ctx.getRequest(),
+ "repos.jsp.message.taskomaticdown", null);
+ }
+ ctx.getRequest().setAttribute("bunches", dropDown);
+ }
+
+ private void addOption(List options, String key, String value) {
+ Map selection = new HashMap();
+ selection.put("label", key);
+ selection.put("value", value);
+ options.add(selection);
+ }
+}
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 6ef0227..bafe513 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
@@ -939,6 +939,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
</trans-unit>
+ <trans-unit id="Task Schedules">
+<source>Task Schedules</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Navigation Menu</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="Task Engine Status">
<source>Task Engine Status</source>
<context-group name="ctx">
@@ -8648,6 +8654,24 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="message.channelsubscribers">
<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>
+ </trans-unit>
+ <trans-unit id="message.schedulecreated">
+ <source>Schedule <strong>{0}</strong> created.</source>
+ </trans-unit>
+ <trans-unit id="message.scheduleupdated">
+ <source>Schedule <strong>{0}</strong> has been updated.</source>
+ </trans-unit>
+ <trans-unit id="message.scheduledeleted">
+ <source>Schedule <strong>{0}</strong> has been deleted.</source>
+ </trans-unit>
+ <trans-unit id="message.schedulenotactive">
+ <source>Schedule <strong>{0}</strong> isn't active any more. It's part of the system just for information purposes and will be deleted automatically.</source>
+ </trans-unit>
+ <trans-unit id="message.scheduledisabled">
+ <source>Please set frequency for the new schedule.</source>
+ </trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidvirt">
<source>Para-Virtualization is unsupported with the selected kickstart tree or distribution.</source>
</trans-unit>
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 d4233fd..5eee44c 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
@@ -22693,6 +22693,248 @@ given channel.</source>
<context context-type="sourcefile">/rhn/channels/manage/ConfirmPrivate.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="bunch.edit.jsp.toolbar">
+ <source>Bunch {0}</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.edit.jsp.bunchdescription">
+ <source>Bunch Description</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.edit.jsp.button-schedule">
+ <source>Single Run Schedule</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.generaldescription">
+ <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.daily-status-bunch">
+ <source>Sends daily report</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.clear-taskologs-bunch">
+ <source>Clears taskomatic run log history</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.cobbler-sync-bunch">
+ <source>Applies any cobbler configuration changes</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.compare-configs-bunch">
+ <source>Schedules a comparison of config files on all systems</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.clean-alerts-bunch">
+ <source>Clears current monitoring alerts</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.sync-probe-bunch">
+ <source>Synchronizes probe state</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.session-cleanup-bunch">
+ <source>Deletes expired rows from the PXTSessions table to keep it from growing too large</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.sandbox-cleanup-bunch">
+ <source>Cleans up sandbox</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.package-cleanup-bunch">
+ <source>Cleans up orphaned packages</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.kickstartfile-sync-bunch">
+ <source>Synchronizes kickstart profiles that were generated using the wizard</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.kickstart-cleanup-bunch">
+ <source>Cleans up stale kickstarts</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.errata-queue-bunch">
+ <source>Processes errata</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.errata-cache-bunch">
+ <source>Recalculates errata cache for a given server or channel</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.channel-repodata-bunch">
+ <source>Generates channel repodata</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.satcert-check-bunch">
+ <source>Checks whether satellite certificate has not expired</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="bunch.jsp.description.cleanup-data-bunch">
+ <source>Cleans up orphaned and outdated data</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.jsp.noschedules">
+ <source>There're no schedules available.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.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">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.delete.jsp.introparagraph">
+ <source>Are you sure you want to delete the schedule? Associated bunch won't get scheduled any more. This can have a huge impact on satellite functionality. Proceed only if you know what you're doing.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/DeleteSchedule.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.toolbar">
+ <source>Schedule {0}</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="toolbar.create.schedule">
+ <source>create schedule</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="toolbar.delete.schedule">
+ <source>delete schedule</source>
+ <context-group name="ctx">
+ <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">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.name">
+ <source>Schedule name</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.bunch">
+ <source>Bunch</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.bunchdescription">
+ <source>Bunch Description</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.activefrom">
+ <source>Active From</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.activetill">
+ <source>Active Till</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.notactive">
+ <source>Schedule isn't active any more.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.frequency">
+ <source>Frequency</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.createschedule">
+ <source>Create Schedule</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.edit.jsp.editschedule">
+ <source>Edit Schedule</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="schedule.delete.jsp.deleteschedule">
+ <source>Delete Schedule</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/DeleteSchedule.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="task.edit.jsp.name">
+ <source>Task Name</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="task.edit.jsp.stattime">
+ <source>Start Time</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
+ <trans-unit id="task.edit.jsp.endtime">
+ <source>End Time</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="confirmprivate.jsp.confirmmsg">
<source>Are you sure you want to set this channel to
<strong>private</strong>, accessible only by systems in your
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
index 1363e49..5686900 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoFactory.java
@@ -321,6 +321,30 @@ public class TaskoFactory extends HibernateFactory {
}
/**
+ * lookup schedule by label
+ * @param jobLabel schedule label
+ * @return schedule
+ */
+ public static TaskoSchedule lookupScheduleByLabel(String jobLabel) {
+ Map params = new HashMap();
+ params.put("job_label", jobLabel);
+ return (TaskoSchedule) singleton.lookupObjectByNamedQuery(
+ "TaskoSchedule.lookupByLabel", params);
+ }
+
+ /**
+ * lookup bunch by label
+ * @param bunchName bunch label
+ * @return bunch
+ */
+ public static TaskoBunch lookupBunchByName(String bunchName) {
+ Map params = new HashMap();
+ params.put("name", bunchName);
+ return (TaskoBunch) singleton.lookupObjectByNamedQuery(
+ "TaskoBunch.lookupByName", params);
+ }
+
+ /**
* lists all schedules for an org
* @param orgId organizational id
* @return list of all schedules
@@ -450,6 +474,18 @@ public class TaskoFactory extends HibernateFactory {
return runs;
}
+ /**
+ * lists runs by bunch
+ * @param bunchName bunch name
+ * @return list of runs
+ */
+ public static List<TaskoRun> listRunsByBunch(String bunchName) {
+ Map params = new HashMap();
+ params.put("bunch_name", bunchName);
+ return singleton.listObjectsByNamedQuery(
+ "TaskoRun.listByBunch", params);
+ }
+
private static boolean runBelongToOrg(Integer orgId, TaskoRun run) {
if (orgId == null) {
return (run.getOrgId() == null);
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 3c17977..3da3c70 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
@@ -41,6 +41,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE scheduleId = :schedule_id]]>
</query>
+ <query name="TaskoRun.listByBunch">
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name = :bunch_name ORDER BY startTime DESC, template.ordering, endTime DESC]]>
+ </query>
+
<query name="TaskoRun.listRunsWithStatus">
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.task.id = :task_id AND (status = :status1 OR status = :status2)]]>
</query>
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
index 81b9513..30375d8 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.hbm.xml
@@ -36,6 +36,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE id = :schedule_id]]>
</query>
+ <query name="TaskoSchedule.lookupByLabel">
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE jobLabel = :job_label]]>
+ </query>
+
<query name="TaskoSchedule.listOlderThan">
<![CDATA[FROM com.redhat.rhn.taskomatic.TaskoSchedule WHERE activeTill < :limit_time]]>
</query>
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
index d9419aa..46776e0 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
@@ -58,6 +58,33 @@ public class TaskoXmlRpcHandler {
}
/**
+ * lookup schedule by id
+ * @param scheduleId schedule id
+ * @return schedule
+ */
+ public TaskoSchedule lookupScheduleById(Integer scheduleId) {
+ return TaskoFactory.lookupScheduleById(scheduleId.longValue());
+ }
+
+ /**
+ * lookup schedule by label
+ * @param jobLabel schedule label
+ * @return schedule
+ */
+ public TaskoSchedule lookupScheduleByLabel(String jobLabel) {
+ return TaskoFactory.lookupScheduleByLabel(jobLabel);
+ }
+
+ /**
+ * lookup bunch by label
+ * @param bunchName bunch label
+ * @return bunch
+ */
+ public TaskoBunch lookupBunchByName(String bunchName) {
+ return TaskoFactory.lookupBunchByName(bunchName);
+ }
+
+ /**
* start scheduling a organizational bunch
* @param orgId organization id
* @param bunchName bunch name
@@ -397,6 +424,15 @@ public class TaskoXmlRpcHandler {
}
/**
+ * lists all satellite runs of a give bunch
+ * @param bunchName bunch name
+ * @return list of runs
+ */
+ public List<TaskoRun> listBunchSatRuns(String bunchName) {
+ return TaskoFactory.listRunsByBunch(bunchName);
+ }
+
+ /**
* get last specified number of bytes of the organizational run std output log
* whole log is returned if nBytes is negative
* @param orgId organization id
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
index eebbc03..838d7fd 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskomaticApi.java
@@ -15,7 +15,9 @@
package com.redhat.rhn.taskomatic;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.domain.channel.Channel;
+import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import java.net.MalformedURLException;
@@ -115,6 +117,45 @@ public class TaskomaticApi {
scheduleParams);
}
+ /**
+ * Creates a new single satellite schedule
+ * @param user shall be sat admin
+ * @param bunchName bunch name
+ * @return date of the first schedule
+ * @throws TaskomaticApiException if there was an error
+ */
+ public Date scheduleSingleSatBunch(User user, String bunchName)
+ throws TaskomaticApiException {
+ ensureSatAdminRole(user);
+ return (Date) invoke("tasko.scheduleSingleSatBunchRun", bunchName, new HashMap());
+ }
+
+ private void ensureSatAdminRole(User user) {
+ if (!user.hasRole(RoleFactory.SAT_ADMIN)) {
+ ValidatorException.raiseException("satadmin.jsp.error.notsatadmin",
+ user.getLogin());
+ }
+ }
+
+ /**
+ * Creates a new schedule, unschedules, if en existing is defined
+ * @param user shall be sat admin
+ * @param jobLabel name of the schedule
+ * @param bunchName bunch name
+ * @param cron cron expression
+ * @return date of the first schedule
+ * @throws TaskomaticApiException if there was an error
+ */
+ public Date scheduleSatBunch(User user, String jobLabel, String bunchName, String cron)
+ throws TaskomaticApiException {
+ ensureSatAdminRole(user);
+ Map task = findSatScheduleByBunchAndLabel(bunchName, jobLabel, user);
+ if (task != null) {
+ unscheduleSatTask(jobLabel, user);
+ }
+ return (Date) invoke("tasko.scheduleSatBunch", bunchName, jobLabel , cron,
+ new HashMap());
+ }
/**
* Unchedule a reposync task
@@ -126,10 +167,40 @@ public class TaskomaticApi {
}
private void unscheduleTask(String jobLabel, User user) {
+ ensureSatAdminRole(user);
invoke("tasko.unscheduleBunch", user.getOrg().getId(), jobLabel);
}
+ /**
+ * unschedule satellite task
+ * @param jobLabel schedule name
+ * @param user shall be satellite admin
+ */
+ public void unscheduleSatTask(String jobLabel, User user) {
+ ensureSatAdminRole(user);
+ invoke("tasko.unscheduleSatBunch", jobLabel);
+ }
+
+ /**
+ * Return list of active schedules
+ * @param user shall be sat admin
+ * @return list of schedules
+ */
+ public List findActiveSchedules(User user) {
+ List<Map> schedules = (List<Map>) invoke("tasko.listActiveSatSchedules");
+ return schedules;
+ }
+ /**
+ * Return list of bunch runs
+ * @param user shall be sat admin
+ * @param bunchName name of the bunch
+ * @return list of schedules
+ */
+ public List findRunsByBunch(User user, String bunchName) {
+ List<Map> runs = (List<Map>) invoke("tasko.listBunchSatRuns", bunchName);
+ return runs;
+ }
private Map findScheduleByBunchAndLabel(String bunchName, String jobLabel, User user) {
List<Map> schedules = (List<Map>) invoke("tasko.listActiveSchedulesByBunch",
@@ -142,6 +213,18 @@ public class TaskomaticApi {
return null;
}
+ private Map findSatScheduleByBunchAndLabel(String bunchName, String jobLabel,
+ User user) {
+ List<Map> schedules = (List<Map>) invoke("tasko.listActiveSatSchedulesByBunch",
+ bunchName);
+ for (Map schedule : schedules) {
+ if (schedule.get("job_label").equals(jobLabel)) {
+ return schedule;
+ }
+ }
+ return null;
+ }
+
/**
* Get the cron format for a single channel
* @param chan the channel
@@ -159,4 +242,45 @@ public class TaskomaticApi {
}
}
+ /**
+ * Return list of available bunches
+ * @param user shall be sat admin
+ * @return list of bunches
+ */
+ public List listSatBunchSchedules(User user) {
+ List<Map> bunches = (List<Map>) invoke("tasko.listSatBunches");
+ return bunches;
+ }
+
+ /**
+ * looks up schedule according to id
+ * @param user shall be sat admin
+ * @param scheduleId schedule id
+ * @return schedule
+ */
+ public Map lookupScheduleById(User user, Long scheduleId) {
+ return (Map) invoke("tasko.lookupScheduleById", scheduleId);
+ }
+
+ /**
+ * looks up schedule according to label
+ * @param user shall be sat admin
+ * @param bunchName bunch name
+ * @param scheduleLabel schedule label
+ * @return schedule
+ */
+ public Map lookupScheduleByBunchAndLabel(User user, String bunchName,
+ String scheduleLabel) {
+ return findSatScheduleByBunchAndLabel(bunchName, scheduleLabel, user);
+ }
+
+ /**
+ * looks up bunch according to name
+ * @param user shall be sat admin
+ * @param bunchName bunch name
+ * @return bunch
+ */
+ public Map lookupBunchByName(User user, String bunchName) {
+ return (Map) invoke("tasko.lookupBunchByName", bunchName);
+ }
}
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 91af90d..805b7a7 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -288,6 +288,13 @@
</rhn-tab>
</rhn-tab>
+ <rhn-tab name="Task Schedules" acl="user_role(satellite_admin)">
+ <rhn-tab-url>/rhn/admin/SatSchedules.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/BunchDetail.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/ScheduleDetail.do</rhn-tab-url>
+ <rhn-tab-url>/rhn/admin/DeleteSchedule.do</rhn-tab-url>
+ </rhn-tab>
+
<rhn-tab name="Task Engine Status" acl="user_role(satellite_admin)" url="/rhn/admin/TaskStatus.do">
</rhn-tab>
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
new file mode 100644
index 0000000..8ceb73c
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -0,0 +1,74 @@
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ 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" %>
+
+<html:xhtml/>
+<html>
+<body>
+
+<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
+ imgAlt="channels.overview.toolbar.imgAlt"
+ creationUrl="/rhn/admin/ScheduleDetail.do"
+ creationType="schedule"
+ creationAcl="user_role(satellite_admin)"
+ helpUrl="">
+ <bean:message key="bunch.edit.jsp.toolbar" arg0="${label}"/>
+</rhn:toolbar>
+
+<rl:listset name="runList">
+
+ <div>
+ <h2><bean:message key="bunch.edit.jsp.bunchdescription"/></h2>
+ <div class="page-summary">
+ <c:out value="${bunchdescription}"/>
+ </div>
+ <div align="right">
+ <input type="submit" name="dispatch"
+ value="<bean:message key="bunch.edit.jsp.button-schedule"/>" />
+ <rhn:submitted/>
+ </div>
+ <hr />
+ <br/>
+ <div class="page-summary">
+ <bean:message key="bunch.jsp.generaldescription"/>
+ </div>
+ </div>
+ <br/>
+ <rl:list
+ emptykey="assignedgroups.jsp.nogroups"
+ dataset="dataset" >
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <rl:column sortable="true"
+ bound="false"
+ styleclass="first-column last-column"
+ headerkey="task.edit.jsp.name"
+ sortattr="task" >
+ <c:out value="${current.task}" />
+ </rl:column>
+
+ <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>
+ </rl:column>
+
+ <rl:column bound="false"
+ headerkey="task.edit.jsp.endtime"
+ sortattr="end_time" >
+ <c:out value="${current.end_time}" />
+ </rl:column>
+
+ <rl:column bound="false"
+ headerkey="kickstart.jsp.status"
+ sortattr="status" >
+ <c:out value="${current.status}" />
+ </rl:column>
+
+</rl:list>
+</rl:listset>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
new file mode 100644
index 0000000..283647f
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/admin/deleteSchedule.jsp
@@ -0,0 +1,66 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ 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" %>
+
+<html>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif">
+ <bean:message key="schedule.edit.jsp.toolbar" arg0="${schedulename}"/>
+</rhn:toolbar>
+
+<div>
+ <html:form action="/admin/DeleteSchedule">
+
+ <h2><bean:message key="schedule.delete.jsp.deleteschedule"/></h2>
+
+ <div class="page-summary">
+ <p><bean:message key="schedule.delete.jsp.introparagraph"/></p>
+ </div>
+
+ <table class="details">
+ <!-- Channel Name -->
+ <tr>
+ <th nowrap="nowrap">
+ <bean:message key="schedule.edit.jsp.name"/>:
+ </th>
+ <td class="small-form">
+ <strong><c:out value="${schedulename}"/></strong>
+ </td>
+ </tr>
+
+ <tr>
+ <th nowrap="nowrap">
+ <bean:message key="schedule.edit.jsp.bunch"/>:
+ </th>
+ <td class="small-form">
+ <c:out value="${bunch}"/>
+ </td>
+ </tr>
+ <c:if test="${cronexpr}">
+ <tr>
+ <th nowrap="nowrap">
+ <bean:message key="schedule.edit.jsp.frequency"/>
+ </th>
+ <td class="small-form">
+ <c:out value="${cronexpr}"/>
+ </td>
+ </tr>
+ </c:if>
+ </table>
+
+ <div align="right">
+ <hr/>
+ <html:submit property="edit_button">
+ <bean:message key="schedule.delete.jsp.deleteschedule"/>
+ </html:submit>
+ </div>
+ <html:hidden property="submitted" value="true"/>
+ <c:if test='${not empty param.schid}'>
+ <html:hidden property="schid" value="${param.schid}"/>
+ </c:if>
+ </html:form>
+</div>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
new file mode 100644
index 0000000..2aa6ffe
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -0,0 +1,128 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ 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" %>
+
+<html>
+<body>
+<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
+ deletionUrl="/rhn/admin/DeleteSchedule.do?schid=${param.schid}"
+ deletionAcl="user_role(satellite_admin); formvar_exists(schid)"
+ deletionType="schedule">
+ <bean:message key="schedule.edit.jsp.toolbar" arg0="${schedulename}"/>
+</rhn:toolbar>
+
+<div>
+ <html:form action="/admin/ScheduleDetail">
+
+ <h2><bean:message key="schedule.edit.jsp.basicscheduledetails"/></h2>
+ <div class="page-summary">
+ <c:if test="${active}">
+ <bean:message key="schedule.edit.jsp.introparagraph"/>
+ </c:if>
+ <c:if test="${not active}">
+ <bean:message key="schedule.edit.jsp.notactive"/>
+ </c:if>
+ </div>
+
+ <br/>
+
+ <table class="details">
+ <tr>
+ <th nowrap="nowrap">
+ <label for="joblabel"><rhn:required-field key="schedule.edit.jsp.name"/>:</label>
+ </th>
+ <td class="small-form">
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:text property="schedulename" maxlength="256" size="48" styleId="name"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${schedulename}"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <tr>
+ <th nowrap="nowrap">
+ <label for="bunch"><rhn:required-field key="schedule.edit.jsp.bunch"/>:</label>
+ </th>
+ <td class="small-form">
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:select property="bunch" >
+ <html:options collection="bunches"
+ property="value"
+ labelProperty="label" />
+ </html:select>
+ </c:when>
+ <c:otherwise>
+ <a href="/rhn/admin/BunchDetail.do?label=${bunch}">${bunch}</a>
+ </c:otherwise>
+ </c:choose>
+ <html:hidden property="bunch" value="${bunch}" />
+ </td>
+ </tr>
+ <c:if test="${empty param.schid or active}">
+ <tr>
+ <th nowrap="nowrap">
+ <label for="parent"><bean:message key="schedule.edit.jsp.frequency"/>:</label>
+ </th>
+ <td class="small-form">
+ <jsp:include page="/WEB-INF/pages/common/fragments/repeat-task-picker.jspf">
+ <jsp:param name="widget" value="date"/>
+ </jsp:include>
+ </td>
+ </tr>
+ </c:if>
+ <c:if test="${not active}">
+ <c:if test="${cron}">
+ <tr>
+ <th nowrap="nowrap">
+ <bean:message key="schedule.edit.jsp.frequency"/>
+ </th>
+ <td class="small-form">
+ <c:out value="${cronexpr}"/>
+ </td>
+ </tr>
+ </c:if>
+ <c:if test='${not empty param.schid}'>
+ <tr>
+ <th nowrap="nowrap">
+ <bean:message key="schedule.edit.jsp.activetill"/>:
+ </th>
+ <td class="small-form">
+ <c:out value="${activetill}"/>
+ </td>
+ </tr>
+ </c:if>
+ </c:if>
+ </table>
+
+ <div align="right">
+ <hr />
+ <c:choose>
+ <c:when test='${empty param.schid}'>
+ <html:submit property="create_button">
+ <bean:message key="schedule.edit.jsp.createschedule"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <c:if test="${active}">
+ <html:submit property="edit_button">
+ <bean:message key="schedule.edit.jsp.editschedule"/>
+ </html:submit>
+ </c:if>
+ </c:otherwise>
+ </c:choose>
+ </div>
+
+ <html:hidden property="submitted" value="true" />
+ <c:if test='${not empty param.schid}'>
+ <html:hidden property="schid" value="${param.schid}" />
+ </c:if>
+</html:form>
+</div>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
new file mode 100644
index 0000000..976a815
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -0,0 +1,57 @@
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ 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" %>
+
+<html:xhtml/>
+<html>
+<body>
+
+<rhn:toolbar base="h1" img="/img/rhn-icon-your_rhn.gif"
+ imgAlt="channels.overview.toolbar.imgAlt"
+ creationUrl="/rhn/admin/ScheduleDetail.do"
+ creationType="schedule"
+ creationAcl="user_role(satellite_admin)"
+ helpUrl="">
+ <bean:message key="task.status.title"/>
+</rhn:toolbar>
+
+<rl:listset name="scheduleList">
+
+ <rl:list
+ emptykey="schedule.jsp.noschedules">
+
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <rl:column sortable="true"
+ bound="false"
+ styleclass="first-column last-column"
+ headerkey="schedule.edit.jsp.name"
+ sortattr="job_label"
+ defaultsort="asc" >
+ <a href="/rhn/admin/ScheduleDetail.do?schid=${current.id}">${current.job_label}</a>
+ </rl:column>
+
+ <rl:column bound="false"
+ headerkey="schedule.edit.jsp.frequency" >
+ <c:out value="${current.cron_expr}" />
+ </rl:column>
+
+ <rl:column sortable="true"
+ bound="false"
+ headerkey="schedule.edit.jsp.activefrom"
+ sortattr="active_from" >
+ <c:out value="${current.active_from}" />
+ </rl:column>
+
+ <rl:column bound="false"
+ headerkey="schedule.edit.jsp.bunch" >
+ <a href="/rhn/admin/BunchDetail.do?label=${current.bunch}">${current.bunch}</a>
+ </rl:column>
+
+</rl:list>
+</rl:listset>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 7747926..7a841a7 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1134,6 +1134,14 @@
<form-property name="submitted" type="java.lang.Boolean" />
</form-bean>
+ <form-bean name="updateTaskSchedule"
+ type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" >
+ <form-property name="schedulename" type="java.lang.String" />
+ <form-property name="bunch" type="java.lang.String" />
+ <form-property name="cronexpr" type="java.lang.String" />
+ <form-property name="submitted" type="java.lang.Boolean" />
+ </form-bean>
+
</form-beans>
<global-exceptions>
@@ -7249,8 +7257,46 @@
type="com.redhat.rhn.frontend.action.satellite.TaskStatusAction">
<forward name="default"
path="/WEB-INF/pages/admin/taskStatus.jsp" />
- <forward name="confirm"
- path="/ssm/Packages.do"/>
+ </action>
+
+ <action path="/admin/SatSchedules"
+ scope="request"
+ input="/WEB-INF/pages/admin/schedules.jsp"
+ type="com.redhat.rhn.frontend.action.tasko.SatSchedulesAction">
+ <forward name="default"
+ path="/WEB-INF/pages/admin/schedules.jsp" />
+ </action>
+
+ <action path="/admin/ScheduleDetail"
+ scope="request"
+ name="updateTaskSchedule"
+ input="/WEB-INF/pages/admin/scheduleDetail.jsp"
+ type="com.redhat.rhn.frontend.action.tasko.ScheduleDetailAction">
+ <forward name="default"
+ path="/WEB-INF/pages/admin/scheduleDetail.jsp" />
+ <forward name="disable"
+ path="/admin/DeleteSchedule.do" redirect="true" />
+ <forward name="success"
+ path="/admin/ScheduleDetail.do" redirect="true" />
+ </action>
+
+ <action path="/admin/DeleteSchedule"
+ scope="request"
+ name="updateTaskSchedule"
+ input="/WEB-INF/pages/admin/deleteSchedule.jsp"
+ type="com.redhat.rhn.frontend.action.tasko.DeleteScheduleAction">
+ <forward name="default"
+ path="/WEB-INF/pages/admin/deleteSchedule.jsp" />
+ <forward name="success"
+ path="/admin/SatSchedules.do" redirect="true" />
+ </action>
+
+ <action path="/admin/BunchDetail"
+ scope="request"
+ input="/WEB-INF/pages/admin/bunchDetail.jsp"
+ type="com.redhat.rhn.frontend.action.tasko.BunchDetailAction">
+ <forward name="default"
+ path="/WEB-INF/pages/admin/bunchDetail.jsp" />
</action>
</action-mappings>
13 years, 1 month
Changes to 'refs/tags/spacewalk-web-1.5.4-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.5.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 08:11 +0000
Tagging package [spacewalk-web] version [1.5.4-1] in directory [web/].
Changes since spacewalk-backend-1.5.13-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.5.4-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
---
13 years, 1 month
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit d07d7530b679966d07b488f1d0ded60c05a43f1e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 10:11:34 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.4-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index cee1197..2072ebd 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.3-1 web/
+1.5.4-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index decb937..0369162 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.3
+Version: 1.5.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,14 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon May 02 2011 Jan Pazdziora 1.5.4-1
+- Patch to run remote commands on multiple machines on Spacewalk 1.4
+ PostgreSQL. (Ville.Salmela(a)csc.fi)
+- Removal of system_value_edit makes set_custom_value unused, dropping.
+- Removal of remove_system_value makes remove_custom_value unused, dropping.
+- The can_delete_custominfokey no longer used after previous removals,
+ removing.
+
* Fri Apr 29 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.3-1
- fixing system query systems_with_package (tlestach(a)redhat.com)
- remove macro from changelog (msuchy(a)redhat.com)
13 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.5.13-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.5.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 08:10 +0000
Tagging package [spacewalk-backend] version [1.5.13-1] in directory [backend/].
Changes since nocpulse-common-2.1.23-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.5.13-1].
---
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 1 month
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 63361b4b757003b30718e13dbf8b1de72a1cc69a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 10:10:56 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 273294a..e5ff4ea 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.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
@@ -679,6 +679,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 02 2011 Jan Pazdziora 1.5.13-1
+- Method reload_packages not used in our code, removing.
+- Removal of ReleaseChannelMapImport makes processReleaseChannelMap unused,
+ removing.
+
* Fri Apr 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.12-1
- 696970 - disabled localization
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a78daca..30d48b1 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.12-1 backend/
+1.5.13-1 backend/
13 years, 1 month
Changes to 'refs/tags/nocpulse-common-2.1.23-1'
by Jan Pazdziora
Tag 'nocpulse-common-2.1.23-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-02 08:10 +0000
Tagging package [nocpulse-common] version [2.1.23-1] in directory [monitoring/nocpulse-common/].
Changes since oracle-rhnsat-selinux-10.2.0.19-1:
Jan Pazdziora (1):
Automatic commit of package [nocpulse-common] release [2.1.23-1].
---
monitoring/nocpulse-common/nocpulse-common.spec | 5 ++++-
rel-eng/packages/nocpulse-common | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 1 month
monitoring/nocpulse-common rel-eng/packages
by Jan Pazdziora
monitoring/nocpulse-common/nocpulse-common.spec | 5 ++++-
rel-eng/packages/nocpulse-common | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3cb2fa87154e786e2c391996e3d6d638c6c62d6c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 10:10:09 2011 +0200
Automatic commit of package [nocpulse-common] release [2.1.23-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 0dfef27..a5cd8cc 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.1.22
+Version: 2.1.23
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -146,6 +146,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 02 2011 Jan Pazdziora 2.1.23-1
+- The close of IO::AtomicFile can also die, we should catch it right there.
+
* Fri Mar 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1
- fixed ownership of NOCpulse/tmp directory
- fixed function decode does not exist (PG)
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index cd14a81..2124f02 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.1.22-1 monitoring/nocpulse-common/
+2.1.23-1 monitoring/nocpulse-common/
13 years, 1 month
Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.19-1'
by Michael Mraka
Tag 'oracle-rhnsat-selinux-10.2.0.19-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-02 07:28 +0000
Tagging package [oracle-rhnsat-selinux] version [10.2.0.19-1] in directory [selinux/oracle-rhnsat-selinux/].
Changes since spacewalk-java-1.5.13-1:
Michael Mraka (2):
699979 - allow oracle to write to configuration manager files
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.19-1].
---
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
---
13 years, 1 month
rel-eng/packages selinux/oracle-rhnsat-selinux
by Michael Mraka
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0332ba6899d01902e3702dde66616c3dfb4701b5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 2 09:28:14 2011 +0200
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.19-1].
diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/oracle-rhnsat-selinux
index e5c3666..dad9695 100644
--- a/rel-eng/packages/oracle-rhnsat-selinux
+++ b/rel-eng/packages/oracle-rhnsat-selinux
@@ -1 +1 @@
-10.2.0.18-1 selinux/oracle-rhnsat-selinux/
+10.2.0.19-1 selinux/oracle-rhnsat-selinux/
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index d140719..6a6e4bf 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-rhnsat
Name: oracle-rhnsat-selinux
-Version: 10.2.0.18
+Version: 10.2.0.19
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -116,6 +116,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.19-1
+- 699979 - allow oracle to write to configuration manager files
+
* Wed Apr 06 2011 Jan Pazdziora 10.2.0.18-1
- 489548, 565417 - upon ORA-3136, database writes to network/log/sqlnet.log.
13 years, 1 month
selinux/oracle-rhnsat-selinux
by Michael Mraka
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 25226d9e8db4b879aacde64788a60e7ff90b0943
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 29 16:47:48 2011 +0200
699979 - allow oracle to write to configuration manager files
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
index dc5fc26..f328b9b 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
@@ -58,3 +58,5 @@
# otherwise this would be unlabeled
/var/tmp/.oracle(/.*)? gen_context(user_u:object_r:oracle_tmp_t,s0)
+# oracle configuration manager stuff
+/opt/apps/oracle/web/product/(.*/)?/ccr/state(/.*)?' gen_context(system_u:object_r:oracle_dbfile_t,s0)
13 years, 1 month