java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml | 2
+-
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml | 4
++--
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml | 2
+-
java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java | 2
+-
18 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit ef3ad029e03970452966d0d33b644b27ec8ab5a4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 30 14:46:49 2011 +0200
640535 - add extra spaces between topic, description and note in Errata Alert e-mails
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml
index 26ca9ee..e028d62 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_bn_IN.xml
@@ -377,7 +377,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml
index 995257f..a2d699b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_de.xml
@@ -471,7 +471,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -499,7 +499,7 @@ Umfassende Informationen zu diesem Erratum finden Sie unter:
Zusammenfassung:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index 8d01d6c..09f9f4a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -330,7 +330,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml
index 7a88101..34cab6a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_es.xml
@@ -470,7 +470,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -498,7 +498,7 @@ Puede encontrar información completa sobre esta errata en:
Resumen:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml
index ff74058..1059c12 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_fr.xml
@@ -463,7 +463,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -491,7 +491,7 @@ Vous pourrez trouver des informations complètes sur cette errata à
l'endroit s
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml
index f90153a..0a46aff 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_gu.xml
@@ -376,7 +376,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml
index 48d4468..372afd6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_hi.xml
@@ -375,7 +375,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml
index e5e07b9..72eb4e8 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_it.xml
@@ -379,7 +379,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml
index 5ae32e2..ac8b702 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ja.xml
@@ -470,7 +470,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -498,7 +498,7 @@ Summary:
概要:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml
index 1b4d8a6..6b3db8f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ko.xml
@@ -378,7 +378,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml
index 27a0b97..6bbe811 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pa.xml
@@ -378,7 +378,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml
index c439af9..2eb4d54 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_pt_BR.xml
@@ -469,7 +469,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -497,7 +497,7 @@ A informação completa sobre estes erros pode ser encontrada no
seguinte local:
Sumário:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml
index f50a738..459f467 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ru.xml
@@ -378,7 +378,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml
index ed5ce43..d753898 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_ta.xml
@@ -378,7 +378,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml
index 797dfc3..5d7c3d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_CN.xml
@@ -470,7 +470,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
@@ -498,7 +498,7 @@ Summary:
总结:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</target></trans-unit>
diff --git
a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml
b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml
index 55eef4e..57203e4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_zh_TW.xml
@@ -378,7 +378,7 @@ Complete information about this errata can be found at the following
location:
Summary:
{3}
-{4}{5}{6}
+{4} {5} {6}
{7}
------------------------------------------------------------------------------
</source>
commit 0703a02f4626f561a7bb7c7c72043aa8a290c64f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 30 12:12:19 2011 +0200
640535 - lower amount of logging mailer messages
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
index 53a6bcc..06622ac 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java
@@ -118,7 +118,7 @@ public class ErrataMailer extends RhnJavaJob {
List orgServers = getOrgRelevantServers(errataId, orgId, channelId);
if (orgServers == null || orgServers.size() == 0) {
- log.info("No relevant servers found for erratum " + errata.getId()
+
+ log.debug("No relevant servers found for erratum " + errata.getId()
+
" in channel " + channelId + " for org " + orgId
+
" ... skipping.");
return;
commit ee32d49f00d78dd06b9e884b0f8cfadcbbb79c2e
Author: Clifford Perry <cperry(a)redhat.com>
Date: Tue Aug 30 12:11:04 2011 +0200
640535 - prevent listing duplicate servers in the Errata Alert e-mails
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index b4254be..64174e9 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -470,7 +470,7 @@ ORDER BY next_action DESC
<mode name="erratamailer_get_relevant_servers">
<query params="errata_id,org_id, channel_id">
- SELECT snv.server_id AS server_id, S.name, S.release, SA.name as arch,
+ SELECT DISTINCT snv.server_id AS server_id, S.name, S.release, SA.name as arch,
urn.user_id
FROM (
--