java/code/src/com/redhat/rhn/FaultException.java |
27 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml |
2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml |
2
java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java |
3 -
utils/spacewalk-common-channels |
3 -
19 files changed, 46 insertions(+), 19 deletions(-)
New commits:
commit 89de9eb0893917e669410d8fe4e31518d754b45d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 23 15:00:00 2013 +0200
993047 - ignore, if activation key already exists
diff --git a/utils/spacewalk-common-channels b/utils/spacewalk-common-channels
index 43edcd1..1063cb6 100755
--- a/utils/spacewalk-common-channels
+++ b/utils/spacewalk-common-channels
@@ -273,7 +273,8 @@ Create everything as well as unlimited activation key for every
channel:
try:
client.activationkey.create(*ak_args)
except xmlrpclib.Fault, e:
- sys.stderr.write("ERROR: %s: %s\n" % (
+ if e.faultCode != 1091: # ignore if ak exists
+ sys.stderr.write("ERROR: %s: %s\n" % (
base_info['label'], e.faultString))
else:
# check whether channel exists
commit ffe5ae59460af783a8c93f4de831616ce8ff504c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 23 14:34:59 2013 +0200
993047 - adding missing space after dot in translation strings
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index 5353efa..a635bf1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -7694,7 +7694,7 @@ Follow this url to see the full list of inactive systems:
<target/>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index c414698..6e9fbdf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -8544,7 +8544,7 @@ Folgen Sie dieser URL für die vollständige Liste inaktiver Systeme:
<target>Eine Organisation muss angegeben werden</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
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 6925e87..6e777fe 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
@@ -6855,7 +6855,7 @@ Follow this url to see the full list of inactive systems:
</context-group>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index f483d05..92fefb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -8544,7 +8544,7 @@ Vaya a esta dirección para ver la lista completa de sistemas
inactivos:
<target>Debe especificar una organización</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index 9ef5dd5..e987e6a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -8545,7 +8545,7 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs
:
<target>Une organisation doit être spécifiée</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index 1d935a5..0dfd6ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -7688,7 +7688,7 @@ Follow this url to see the full list of inactive systems:
<target/>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index cd9b3b2..359a228 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -7688,7 +7688,7 @@ Follow this url to see the full list of inactive systems:
<target/>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index fca69c9..2c8bfa6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -8543,7 +8543,7 @@ Seguite l'url sotto riportato per visualizzare l'elenco
completo di sistemi inat
<target>È necessario specificare una organizzazione</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 4718e0a..69816d0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -8542,7 +8542,7 @@ Follow this url to see the full list of inactive systems:
<target>組織を指定する必要があります。</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index be96c20..057bd1c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -8544,7 +8544,7 @@ Follow this url to see the full list of inactive systems:
<target>조직을 지정해야 합니다 </target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index b1b6f7d..927bb1b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -7689,7 +7689,7 @@ Follow this url to see the full list of inactive systems:
<target/>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 7bda05e..8eb8b80 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -8530,7 +8530,7 @@ Follow this url to see the full list of inactive systems:
<target>Uma organização deve ser especificada</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index 9d3da60..7100503 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -8540,7 +8540,7 @@ Follow this url to see the full list of inactive systems:
<target>Необходимо выбрать организацию</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index 23a3c91..05ac4a2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -7687,7 +7687,7 @@ url பின்பற்றி செயலிழக்கப்பட்ட
<target/>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index dbcc1bd..6717e0b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -8544,7 +8544,7 @@ Follow this url to see the full list of inactive systems:
<target>必须指定一个组织。</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 19122aa..9ed9bba 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -8543,7 +8543,7 @@ Follow this url to see the full list of inactive systems:
<target>必須指定一個組織</target>
</trans-unit>
<trans-unit id="system.entitle.invalid_addon_entitlement">
- <source>Invalid add-on entitlement [{0}] provided.No such entitlement
exists.</source>
+ <source>Invalid add-on entitlement [{0}] provided. No such entitlement
exists.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/rhn/systems/details/Overview.do</context>
</context-group>
commit 8fdd82d14192e2497c8a80d25e95fe40861ffd56
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 23 12:29:51 2013 +0200
993047 - throw correct exception if activation key already exists
diff --git a/java/code/src/com/redhat/rhn/FaultException.java
b/java/code/src/com/redhat/rhn/FaultException.java
index 03cd282..50998fc 100644
--- a/java/code/src/com/redhat/rhn/FaultException.java
+++ b/java/code/src/com/redhat/rhn/FaultException.java
@@ -16,6 +16,11 @@
package com.redhat.rhn;
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.validator.ValidatorError;
+import com.redhat.rhn.common.validator.ValidatorResult;
+import com.redhat.rhn.common.validator.ValidatorWarning;
+
+import java.util.Iterator;
/**
* Generic XML RPC fault
@@ -72,6 +77,28 @@ public class FaultException extends RuntimeException {
}
/**
+ * create an exception from a ValidatorResult
+ * @param errorIn error number
+ * @param labelIn label
+ * @param resultIn validator result
+ * @return new FaultException
+ */
+ public static FaultException create(int errorIn, String labelIn,
+ ValidatorResult resultIn) {
+ for (Iterator <ValidatorError> iter = resultIn.getErrors().iterator();
+ iter.hasNext();) {
+ ValidatorError ve = iter.next();
+ return new FaultException(errorIn, labelIn, ve.getKey(), ve.getValues());
+ }
+ for (Iterator <ValidatorWarning> iter = resultIn.getWarnings().iterator();
+ iter.hasNext();) {
+ ValidatorWarning vw = iter.next();
+ return new FaultException(errorIn, labelIn, vw.getKey(), vw.getValues());
+ }
+ return new FaultException(errorIn, labelIn, "");
+ }
+
+ /**
* Returns the value of errorCode
* @return int errorCode
*/
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
index b950cf9..4085f11 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java
@@ -35,7 +35,6 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelException;
-import com.redhat.rhn.frontend.xmlrpc.InvalidEntitlementException;
import com.redhat.rhn.frontend.xmlrpc.InvalidPackageException;
import com.redhat.rhn.frontend.xmlrpc.InvalidServerGroupException;
import com.redhat.rhn.frontend.xmlrpc.MissingEntitlementException;
@@ -186,7 +185,7 @@ public class ActivationKeyHandler extends BaseHandler {
return newKey.getKey();
}
catch (ValidatorException ve) {
- throw new InvalidEntitlementException(ve);
+ throw FaultException.create(1091, "activationkey",
ve.getResult());
}
catch (NonUniqueObjectException e) {
throw new ActivationKeyAlreadyExistsException();