3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 311 +++++-----
java/spacewalk-java.spec | 8
rel-eng/packages/spacewalk-java | 2
3 files changed, 166 insertions(+), 155 deletions(-)
New commits:
commit 059b533fab4e108d48f1e2a36752935390b1aa70
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 17:05:55 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.60-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ae1db6f..27eedf4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.59
+Version: 2.1.60
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.60-1
+- added messages for SystemRemoteCommandAction.java
+- reformated xliff file using xmllint
+- using @@PRODUCT_NAME@@ instead of Spacewalk
+- api doc fix
+
* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.59-1
- add support for enhances rpm weak dependency (java) (bnc#846436)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 11be899..42bfe71 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.59-1 java/
+2.1.60-1 java/
commit afb035912a4b91aaa5ea9deee1e0dbabfecc2e43
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 16:58:49 2013 +0200
added messages for SystemRemoteCommandAction.java
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 56611e0..9669c0c 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
@@ -14858,6 +14858,18 @@ any of these revisions. Are you sure you want to do this?</source>
<source>The errata below apply to one or more of your selected systems.</source>
</trans-unit>
</group>
+ <trans-unit id="ssm.operations.actionchaindetails.schedulesuccess">
+ <source>Action chain "{0}" has been successfully scheduled at "{1}".</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.actionchaindetails.purgesuccess">
+ <source>Action chain "{0}" has been purged.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.actionchaindetails.scheduleerror.general">
+ <source>Unable to schedule chain action.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.actionchaindetails.scheduleerror.general.param">
+ <source>Fatal error due to {0}.</source>
+ </trans-unit>
<!-- ssm/packages.jsp -->
<group>
<context-group name="ctx">
commit 215c5a846cb577babbf50eb836e7a238de405c6c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 16:57:37 2013 +0200
reformated xliff file using xmllint
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 ac8d527..56611e0 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
@@ -1042,7 +1042,7 @@
<source>Comma (",", default)</source>
</trans-unit>
<trans-unit id="preferences.jsp.csvsemicolon">
- <source>Semicolon (";", compatible with Microsoft® Excel®)</source>
+ <source>Semicolon (";", compatible with Microsoft® Excel®)</source>
</trans-unit>
<trans-unit id="preferences.jsp.submitvalue">
<source>Save Preferences</source>
@@ -4637,67 +4637,65 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="ssm.misc.index.syspref.preference">
<source>Preference</source>
</trans-unit>
-
<trans-unit id="ssm.misc.reboot.header">
- <source>Reboot of the Systems</source>
+ <source>Reboot of the Systems</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.summary">
- <source>Choose the systems you need to reboot and run action immediately or schedule it for later.</source>
+ <source>Choose the systems you need to reboot and run action immediately or schedule it for later.</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.operationname">
- <source>Schedule Systems Reboot</source>
+ <source>Schedule Systems Reboot</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.message.success.default">
- <source>Systems reboot has been scheduled.</source>
+ <source>Systems reboot has been scheduled.</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.message.error.noselect">
- <source>Please select at least one system for reboot.</source>
+ <source>Please select at least one system for reboot.</source>
</trans-unit>
-
- <trans-unit id="ssm.misc.lockunlock.tabtitle">
- <source>Lock/Unlock</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.header">
- <source>Lock or Unlock the Systems</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.summary">
- <source>Select system to lock or unlock their profiles. No updates will occur to locked systems until they are unlocked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.dispatch.lock">
- <source>Lock</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.dispatch.unlock">
- <source>Unlock</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.locked.success">
- <source>Out of {0} selected systems, {1} has been locked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.locked.skipped">
- <source>No systems has been locked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.locked.all.success">
- <source>All selected systems has been locked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.locked.all.skipped">
- <source>None of selected systems has been locked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.unlocked.success">
- <source>Out of {0} selected systems, {1} has been unlocked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.unlocked.skipped">
- <source>No systems has been unlocked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.success">
- <source>All selected systems has been unlocked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.skipped">
- <source>None of selected systems has been unlocked.</source>
- </trans-unit>
- <trans-unit id="ssm.misc.lockunlock.message.locked.missingreason">
- <source>In order to lock a system, please specify the reason.</source>
- </trans-unit>
- </group>
-<!-- == Systems == -->
+ <trans-unit id="ssm.misc.lockunlock.tabtitle">
+ <source>Lock/Unlock</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.header">
+ <source>Lock or Unlock the Systems</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.summary">
+ <source>Select system to lock or unlock their profiles. No updates will occur to locked systems until they are unlocked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.dispatch.lock">
+ <source>Lock</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.dispatch.unlock">
+ <source>Unlock</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.locked.success">
+ <source>Out of {0} selected systems, {1} has been locked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.locked.skipped">
+ <source>No systems has been locked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.locked.all.success">
+ <source>All selected systems has been locked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.locked.all.skipped">
+ <source>None of selected systems has been locked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.unlocked.success">
+ <source>Out of {0} selected systems, {1} has been unlocked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.unlocked.skipped">
+ <source>No systems has been unlocked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.success">
+ <source>All selected systems has been unlocked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.unlocked.all.skipped">
+ <source>None of selected systems has been unlocked.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.lockunlock.message.locked.missingreason">
+ <source>In order to lock a system, please specify the reason.</source>
+ </trans-unit>
+ </group>
+ <!-- == Systems == -->
<trans-unit id="overview.jsp.header">
<source>System Overview</source>
<context-group name="ctx">
@@ -14761,110 +14759,105 @@ any of these revisions. Are you sure you want to do this?</source>
<source>Note: only child channel subscription changes and package install/remove/upgrade/verify tasks are listed.</source>
</trans-unit>
</group>
-
<!-- /rhn/systems/ssm/kickstart/KickstartableSystems.do -->
<group>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/ssm/kickstart/KickstartableSystems.do</context>
- </context-group>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title">
- <source>Label</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.schedule.succeed">
- <source>Task "{0}" has been scheduled successfully at {1}.</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.body">
- <source>Run {0} Script on {1} {2} ({3}).</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_single">
- <source>client</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_plural">
- <source>clients</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.missing">
- <source>Username on the target system cannot be missing.</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.missing">
- <source>Group name on the target system is not specified.</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.missing">
- <source>No script has been specified.</source>
- </trans-unit>
-
- <!-- Single System Remote Command Form Labels -->
- <trans-unit id="ssm.overview.provisioning.remotecommand.staticname">
- <source>Remote Command on {0}.</source>
- </trans-unit>
- <trans-unit id="ssm.overview.provisioning.remotecommand.succeed">
- <source>Remote Command has been <a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">scheduled successfully</a> at <strong>{2}</strong>.</source>
- </trans-unit>
- <trans-unit id="ssm.overview.provisioning.remotecommand.header">
- <source>Remote Command on {0}</source>
- </trans-unit>
- <trans-unit id="">
- <source></source>
- </trans-unit>
- <trans-unit id="">
- <source></source>
- </trans-unit>
-
- <!-- SSM Remote Command Form Labels -->
- <trans-unit id="ssm.operations.provisioning.remotecommand.header">
- <source>Schedule Remote Command</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.summary">
- <source>The following script will be scheduled to run on the systems listed below.</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.tip.header">
- <source>Tip</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.tip.text">
- <source>Type new label of the queue or select from the existing. Please note, that the schedule date above will be ignored in this case.</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.label">
- <source>Run as user (UID)</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.label">
- <source>Run as group (GID)</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.timeout.label">
- <source>Timeout (seconds)</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.lbl.label">
- <source>Command label</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.label">
- <source>Script</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.date.label">
- <source>Schedule no sooner than</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.chain_id.new">
- <source>New...</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.form.submit">
- <source>Schedule</source>
- </trans-unit>
- <trans-unit id="ssm.operations.provisioning.remotecommand.nosystems">
- <source>No systems within this set are available to run remote commands.</source>
- </trans-unit>
- <trans-unit id="stringutil.scriptcheck.error.noshelldefined">
- <source>Script does not contain shell definition.</source>
- </trans-unit>
- <trans-unit id="stringutil.scriptcheck.error.noscript">
- <source>Script is does not seems like doing anything.</source>
- </trans-unit>
-
- <!-- Errata -->
- <trans-unit id="ssm.patches.list.header">
- <source>Relevant Errata List</source>
- </trans-unit>
- <trans-unit id="ssm.patches.list.summary">
- <source>The errata below apply to one or more of your selected systems.</source>
- </trans-unit>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/systems/ssm/kickstart/KickstartableSystems.do</context>
+ </context-group>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title">
+ <source>Label</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.schedule.succeed">
+ <source>Task "{0}" has been scheduled successfully at {1}.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.body">
+ <source>Run {0} Script on {1} {2} ({3}).</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_single">
+ <source>client</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_label.title.default.client_plural">
+ <source>clients</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.missing">
+ <source>Username on the target system cannot be missing.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.missing">
+ <source>Group name on the target system is not specified.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.missing">
+ <source>No script has been specified.</source>
+ </trans-unit>
+ <!-- Single System Remote Command Form Labels -->
+ <trans-unit id="ssm.overview.provisioning.remotecommand.staticname">
+ <source>Remote Command on {0}.</source>
+ </trans-unit>
+ <trans-unit id="ssm.overview.provisioning.remotecommand.succeed">
+ <source>Remote Command has been <a href="/network/systems/details/history/event.pxt?sid={0}&hid={1}">scheduled successfully</a> at <strong>{2}</strong>.</source>
+ </trans-unit>
+ <trans-unit id="ssm.overview.provisioning.remotecommand.header">
+ <source>Remote Command on {0}</source>
+ </trans-unit>
+ <trans-unit id="">
+ <source/>
+ </trans-unit>
+ <trans-unit id="">
+ <source/>
+ </trans-unit>
+ <!-- SSM Remote Command Form Labels -->
+ <trans-unit id="ssm.operations.provisioning.remotecommand.header">
+ <source>Schedule Remote Command</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.summary">
+ <source>The following script will be scheduled to run on the systems listed below.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.tip.header">
+ <source>Tip</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.tip.text">
+ <source>Type new label of the queue or select from the existing. Please note, that the schedule date above will be ignored in this case.</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.uid.label">
+ <source>Run as user (UID)</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.gid.label">
+ <source>Run as group (GID)</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.timeout.label">
+ <source>Timeout (seconds)</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.lbl.label">
+ <source>Command label</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.script_body.label">
+ <source>Script</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.date.label">
+ <source>Schedule no sooner than</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.chain_id.new">
+ <source>New...</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.form.submit">
+ <source>Schedule</source>
+ </trans-unit>
+ <trans-unit id="ssm.operations.provisioning.remotecommand.nosystems">
+ <source>No systems within this set are available to run remote commands.</source>
+ </trans-unit>
+ <trans-unit id="stringutil.scriptcheck.error.noshelldefined">
+ <source>Script does not contain shell definition.</source>
+ </trans-unit>
+ <trans-unit id="stringutil.scriptcheck.error.noscript">
+ <source>Script is does not seems like doing anything.</source>
+ </trans-unit>
+ <!-- Errata -->
+ <trans-unit id="ssm.patches.list.header">
+ <source>Relevant Errata List</source>
+ </trans-unit>
+ <trans-unit id="ssm.patches.list.summary">
+ <source>The errata below apply to one or more of your selected systems.</source>
+ </trans-unit>
</group>
-
<!-- ssm/packages.jsp -->
<group>
<context-group name="ctx">
10 years, 6 months
Changes to 'refs/tags/spacewalk-web-2.1.27-1'
by Michael Mraka
Tag 'spacewalk-web-2.1.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-23 12:36 +0000
Tagging package [spacewalk-web] version [2.1.27-1] in directory [web/].
Changes since spacewalk-schema-2.1.22-1:
Michael Mraka (2):
report package arch in Event History
Automatic commit of package [spacewalk-web] release [2.1.27-1].
Stephen Herr (1):
api doc fix
Tomas Kasparek (1):
using @@PRODUCT_NAME@@ instead of Spacewalk
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 6 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 6 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 5 -
rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/Server.pm | 32 ++++++++--
web/modules/rhn/RHN/Server.pm | 16 ++---
web/spacewalk-web.spec | 5 +
16 files changed, 75 insertions(+), 51 deletions(-)
---
10 years, 6 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/Server.pm | 32 +++++++++++++++++++++++++++-----
web/modules/rhn/RHN/Server.pm | 16 ++++++++--------
web/spacewalk-web.spec | 5 ++++-
4 files changed, 40 insertions(+), 15 deletions(-)
New commits:
commit 178f674f035557253c65e43e7b7fef482acea2f7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 14:36:30 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.27-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 58851b9..7d05402 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.26-1 web/
+2.1.27-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 176de76..4dbb812 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.26
+Version: 2.1.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -271,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1
+- report package arch in Event History
+
* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
- add support for enhances rpm weak dependency (web) (bnc#846436)
- 1020497 - provide a way to order kickstart scripts
commit b6430c1edf76b42219c689d1dd056e0f2cd1078e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 13:59:39 2013 +0200
report package arch in Event History
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 91ca497..8d08737 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -600,15 +600,22 @@ sub server_event_package_action {
SELECT PN.name ||
CASE
WHEN PE.id IS NULL THEN ''
- ELSE '-' || evr_t_as_vre_simple(PE.evr) END
- AS NVRE,
+ ELSE '-' || evr_t_as_vre_simple(PE.evr) END ||
+ CASE
+ WHEN AP.package_arch_id is NULL THEN ''
+ ELSE '.' || ARCH.label END
+ AS NVREA,
AP.id AS ACTION_PACKAGE_ID,
PN.id || '|' || PE.id AS id_combo,
AP.package_arch_id
FROM rhnPackageName PN,
- rhnActionPackage AP LEFT OUTER JOIN
+ rhnActionPackage AP
+ LEFT OUTER JOIN
rhnPackageEVR PE
ON AP.evr_id = PE.id
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = AP.package_arch_id
WHERE AP.action_id = :aid
AND AP.name_id = PN.id
EOS
@@ -664,13 +671,22 @@ sub server_event_delta_action {
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
-SELECT rTO.label AS OPERATION, PN.name AS NAME, PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE
+SELECT rTO.label AS OPERATION,
+ PN.name AS NAME,
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) ||
+ CASE
+ WHEN TP.package_arch_id is NULL THEN ''
+ ELSE '.' || ARCH.label END
+ AS NVREA
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnTransactionOperation rTO,
rhnTransactionPackage TP,
rhnPackageDeltaElement PDE,
rhnActionPackageDelta APD
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = TP.package_arch_id
WHERE APD.action_id = :aid
AND APD.package_delta_id = PDE.package_delta_id
AND PDE.transaction_package_id = TP.id
@@ -1859,7 +1875,10 @@ sub event_package_results {
SELECT SAPR.RESULT_CODE,
SAPR.STDOUT,
SAPR.STDERR,
- PN.name || CASE WHEN PE.id IS NULL THEN '' ELSE '-' || evr_t_as_vre_simple(PE.evr) END AS NVRE,
+ PN.name ||
+ CASE WHEN PE.id IS NULL THEN '' ELSE '-' || evr_t_as_vre_simple(PE.evr) END ||
+ CASE WHEN AP.package_arch_id is NULL THEN '' ELSE '.' || ARCH.label END
+ AS NVRE,
AP.id AS ACTION_PACKAGE_ID,
PN.id || '|' || PE.id AS ID_COMBO,
AP.package_arch_id,
@@ -1871,6 +1890,9 @@ SELECT SAPR.RESULT_CODE,
rhnPackageEVR PE,
rhnPackageName PN,
rhnActionPackage AP
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = AP.package_arch_id
WHERE AP.action_id = :aid
AND AP.name_id = :name_id
AND AP.evr_id = :evr_id
diff --git a/web/modules/rhn/RHN/Server.pm b/web/modules/rhn/RHN/Server.pm
index 08fd5a8..990d8a0 100644
--- a/web/modules/rhn/RHN/Server.pm
+++ b/web/modules/rhn/RHN/Server.pm
@@ -300,7 +300,7 @@ sub render {
$ret->{server_event_details} .= qq{<div class="action-summary-package">$package_name to be removed:<br /><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -321,7 +321,7 @@ sub render {
$ret->{server_event_details} .= qq{<div class="action-summary-package">Packages to be verified:<br /><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -366,7 +366,7 @@ EOQ
$html .= "\n </li>";
- $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE});
+ $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE});
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -386,7 +386,7 @@ sub render {
$ret->{server_event_details} .= qq{<div class="action-summary-package">Packages Scheduled:<br /><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -421,7 +421,7 @@ EOQ
$html .= "\n </li>";
- $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE});
+ $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA}, $self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO}, $pkg->{RESULTS}->{RESULT_CODE});
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -449,7 +449,7 @@ sub render {
my @packages;
for my $pkg (@{$self->{PACKAGES}}) {
if ($packages[-1] and $packages[-1]->{NAME} eq $pkg->{NAME}) {
- $packages[-1]->{OTHER_NVRE} = $pkg->{NVRE};
+ $packages[-1]->{OTHER_NVREA} = $pkg->{NVREA};
$packages[-1]->{OPERATION} = 'replace';
}
else {
@@ -460,10 +460,10 @@ sub render {
for my $pkg (@packages) {
my $op = $operation_label_map{$pkg->{OPERATION}};
if ($pkg->{OPERATION} eq 'replace') {
- $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVRE} with $pkg->{OTHER_NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVREA} with $pkg->{OTHER_NVREA}</li>\n};
}
else {
- $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li class="action-summary-package-nvre">$op $pkg->{NVREA}</li>\n};
}
}
$ret->{server_event_details} .= qq{</ul></div>\n};
10 years, 6 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 6 +++---
11 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 833049f222500ba524d782794d3c4d3667128281
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Oct 23 14:30:46 2013 +0200
using @@PRODUCT_NAME@@ instead of Spacewalk
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 1c6d391..69edda6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5278,7 +5278,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>Systemprofil-Aktualisierung</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Falls Sie Hardware auf Ihrem System geändert haben oder manuell RPMs installiert haben und diese Änderungen nicht in Spacewalk erscheinen, müssen Sie eine Systemprofil-Aktualisierung durchführen.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5322,7 +5322,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>Systeme neustarten</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Mit Red Hat Enterprise Linux 3 oder neueren Releases erlaubt Spacewalk Ihnen den Neustart Ihrer Systeme von Remote aus.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5330,7 +5330,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>Systeme sperren</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>Systeme können gesperrt oder entsperrt werden. Eine Sperrung verhindert Änderungen von der Spacewalk-Website.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
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 b60ae43..ac8d527 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
@@ -4551,7 +4551,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<source>System Profile Updates</source>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
<source>Update Hardware Profile</source>
@@ -4584,13 +4584,13 @@ value for this entitlement, excluding the default organization's consumption.</s
<source>Reboot Systems</source>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
<source>Lock Systems</source>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
<source>Lock System Profiles</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index bbc8416..1c8cc47 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5277,7 +5277,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Actualizaciones de perfil de sistema</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Si ha cambiado hardware en su sistema o si ha instalado RPM de forma manual, y esos cambios no aparecen en Spacewalk, necesitará programar una actualización de perfil.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5321,7 +5321,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Reiniciar sistemas</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Con Red Hat Enterprise Linux 3 o lanzamientos más recientes, Spacewalk le permite reiniciar sus sistemas de forma remota.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5329,7 +5329,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Bloquear sistemas</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>Los sistemas pueden ser bloqueados o desbloqueados. Al bloquear los sistemas no se pueden hacer cambios desde el sitio web de Spacewalk.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index aaa819a..09bcf79 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5278,7 +5278,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Mises à jour de profils système</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Si vous avez modifié le matériel sur votre système ou si vous avez installé des RPM manuellement et que ces changements n'apparaissent pas sur Spacewalk, vous devrez programmer une mise à jour du profil.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5322,7 +5322,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Redémarrer les systèmes</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Sur Red Hat Enterprise Linux 3 ou sur des versions plus récentes, Spacewalk vous permet de redémarrer vos systèmes à distance.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5330,7 +5330,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Verrouillage des systèmes</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>Les systèmes peuvent être verrouillés ou déverrouillés. Le verrouillage permet de prévenir des modifications à partir du site web Spacewalk.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index a272a79..034b5aa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5277,7 +5277,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Aggiornamento profilo hardware</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Se non è stato modificato l'hardware sul sistema o se sono stati installati manualmente gli RPM e le modifiche non sono presenti su Spacewalk, allora sarà necessario programmare un aggiornamento del profilo.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5321,7 +5321,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Riavvia il sistema</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Con Red Hat Enterprise Linux 3 o versioni più recenti, Spacewalk permette di eseguire il riavvio remoto dei sistemi.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5329,7 +5329,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Blocca i sistemi</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>I sistemi possono essere bloccati o sbloccati. Il blocco impedisce le modifiche dal sito web di Spacewalk.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 4e49029..d1d61c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5279,7 +5279,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムプロファイルの更新</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>システム上のハードウェアに変更を行っている場合、または手作業で RPM をインストールしている場合、Spacewalk には変更が表示されません。プロファイルの更新をスケジュールする必要があります。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5323,7 +5323,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムの再起動</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Red Hat Enterprise Linux 3 またはそれ以降のリリースでは、Spacewalk を使用するとシステムをリモートで起動することができるようになります。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5331,7 +5331,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムのロック</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>システムのロックおよびロックの解除ができます。システムをロックすると Spacewalk Web サイトから変更されなくなります。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index a70ff43..b537e1a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5276,7 +5276,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 프로파일 업데이트 </target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>시스템의 하드웨어를 변경하거나 수동으로 RPM을 설치하는 경우 이러한 변경 사항은 Spacewalk에 표시되지 않습니다. 프로파일 업데이트를 스케줄해야 합니다.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5320,7 +5320,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 재부팅 </target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Red Hat Enterprise Linux 3 또는 이후 버전에서 Spacewalk를 사용하여 시스템을 원격으로 재부팅할 수 있습니다.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5328,7 +5328,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 잠금 </target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>시스템을 잠금 또는 잠금 해제할 수 있습니다. 시스템을 잠그면 Spacewalk 웹사이트에서 변경되지 않게 합니다.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index a913255..c501547 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5275,7 +5275,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Atualizações de Perfil de Sistema</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Se você mudou o hardware em seu sistema ou instalou manualmente RPMs, e estas mudanças não aparecem no Spacewalk, você irá precisar agendar uma atualização de perfil.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5319,7 +5319,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Reinicializar Sistemas</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Com o Red Hat Enterprise Linux 3 ou lançamentos mais novos, o Spacewal permite que você reinicialize de forma remota seus sistemas.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5327,7 +5327,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Bloquear Sistemas</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>Sistemas podem ser bloqueados ou desbloqueados. Bloqueá-los evita mudanças a partir do website Spacewalk.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index c664474..69cd388 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5274,7 +5274,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Обновления профилей систем</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>Если интерфейс Spacewalk не отражает новые устройства и установленные вручную пакеты, рекомендуется назначить обновление профиля системы.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5318,7 +5318,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Перезагрузить системы</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>Начиная с Red Hat Enterprise Linux 3, Spacewalk позволяет удаленно перезагрузить системы.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5326,7 +5326,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Блокирование систем</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>Блокирование систем позволяет предотвратить их изменение на сайте Spacewalk.</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index d3ad636..0fdbbdd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5277,7 +5277,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系统侧写更新</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>如果您已更改系统中的硬件,或者手动安装 RPM,且那些更改没有出现在 Spacewalk 中,则您需要调度一个侧写更新。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5321,7 +5321,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>重启系统</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>在红帽企业版 Linux 3 或者更新的发行本中,Spacewalk 可让您远程重启系统。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5329,7 +5329,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>锁定系统</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>可以锁定或者取消锁定系统。锁定系统可防止来自 Spacewalk 网站的更改。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index b026ccb..e127c50 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5274,7 +5274,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系統設定檔更新</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.summary">
- <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on Spacewalk, you need to schedule a profile update.</source>
+ <source>If you've changed hardware on your system or have manually installed RPMs, and those changes are not appearing on @@PRODUCT_NAME@@, you need to schedule a profile update.</source>
<target>若您更改了您系統上的硬體,或是手動式安裝了 RPM,並且這些變更並未出現在 Spacewalk 上的話,您將需要排程設定檔更新。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.profileupdates.hardware">
@@ -5318,7 +5318,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>重新啟動系統</target>
</trans-unit>
<trans-unit id="ssm.misc.index.reboot.summary">
- <source>With Red Hat Enterprise Linux 3 or newer releases, Spacewalk allows you to remotely reboot your systems.</source>
+ <source>With Red Hat Enterprise Linux 3 or newer releases, @@PRODUCT_NAME@@ allows you to remotely reboot your systems.</source>
<target>當使用 Red Hat Enterprise Linux 3 或是更新發行版時,Spacewalk 能讓您遠端重新啟動系統。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.header">
@@ -5326,7 +5326,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>鎖定系統</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.summary">
- <source>Systems may be locked or unlocked. Locking prevents changes from the Spacewalk website.</source>
+ <source>Systems may be locked or unlocked. Locking prevents changes from the @@PRODUCT_NAME@@ website.</source>
<target>您可鎖定系統或解除其鎖定。鎖定能避免來自於 Spacewalk 網站的變更。</target>
</trans-unit>
<trans-unit id="ssm.misc.index.lock.lock">
10 years, 6 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit fbd5f0475dd3865bbbf6d941eb7e3c6988a375cc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Oct 22 15:53:33 2013 -0400
api doc fix
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index 4f16b34..09bd801 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -391,14 +391,13 @@ public class ProfileHandler extends BaseHandler {
/**
* List the pre and post scripts for a kickstart profile in the order
- * they will run.
+ * they will run during the kickstart.
* @param sessionKey key
* @param label the kickstart label
* @return list of kickstartScript objects
*
* @xmlrpc.doc List the pre and post scripts for a kickstart profile
- * in the order they will run.
- * profile
+ * in the order they will run during the kickstart.
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "ksLabel", "The label of the
* kickstart")
10 years, 6 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 416d698881938345fb0d9eeb45a1fb952243bd57
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 22 14:45:35 2013 +0200
Automatic commit of package [spacewalk-schema] release [2.1.22-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 258e22f..dab0968 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.21-1 schema/spacewalk/
+2.1.22-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index b94be63..bdb33a5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.21
+Version: 2.1.22
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1
+- Regenerate the metadata for rpm enhances dependency (bnc#846436)
+- add support for enhances rpm weak dependency (schema) (bnc#846436)
+
* Thu Oct 17 2013 Stephen Herr <sherr(a)redhat.com> 2.1.21-1
- 1020497 - provide a way to order kickstart scripts
10 years, 6 months
Changes to 'refs/tags/spacewalk-schema-2.1.22-1'
by Michael Mraka
Tag 'spacewalk-schema-2.1.22-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:45 +0000
Tagging package [spacewalk-schema] version [2.1.22-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-2.1.59-1:
Michael Mraka (2):
Automatic commit of package [spacewalk-web] release [2.1.26-1].
Automatic commit of package [spacewalk-schema] release [2.1.22-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 12 insertions(+), 4 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/spacewalk-web-2.1.26-1'
by Michael Mraka
Tag 'spacewalk-web-2.1.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:45 +0000
Tagging package [spacewalk-web] version [2.1.26-1] in directory [web/].
Changes since spacewalk-java-2.1.59-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [2.1.26-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/spacewalk-java-2.1.59-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.59-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-22 12:44 +0000
Tagging package [spacewalk-java] version [2.1.59-1] in directory [java/].
Changes since spacewalk-backend-2.1.32-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [2.1.59-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 6 months
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 7770d922196717a969ab384687465d155315e8c2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 22 14:45:10 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.26-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c875299..58851b9 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.25-1 web/
+2.1.26-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ca32265..176de76 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.25
+Version: 2.1.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -271,6 +271,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
+- add support for enhances rpm weak dependency (web) (bnc#846436)
+- 1020497 - provide a way to order kickstart scripts
+
* Tue Oct 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1
- 1018194 - convert empty string to NULL
commit 1a1d717f480c224226fe8ca0ec3192cc2f5fcc0e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Oct 22 14:44:50 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.59-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c9a63ad..ae1db6f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.58
+Version: 2.1.59
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.59-1
+- add support for enhances rpm weak dependency (java) (bnc#846436)
+
* Fri Oct 18 2013 Stephen Herr <sherr(a)redhat.com> 2.1.58-1
- 1020497 - fixing a bug and adding a unit test for ordering kickstarts
- Cobbler tests: added missing return
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a352366..11be899 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.58-1 java/
+2.1.59-1 java/
10 years, 6 months