java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java |
4 ++--
java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java |
4 ++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java |
4 ++--
web/modules/rhn/RHN/DB/ErrataEditor.pm |
4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 96f4e2cdeebc50d35b8a0e959506452eadb0aa26
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Apr 4 10:37:50 2012 +0200
Fix naming of cloned errata to replace only the first 2 chars
when replacing first 3 chars, errata type information gets lost
(RHBA - > CLA / CLBA)
based on Johannes Renner pathes from:
https://www.redhat.com/archives/spacewalk-devel/2012-March/msg00022.html
just prepending "CL-" to the original erratum name isn't good due to the
maximum
errata name limitation
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 586be0b..f4477cc 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -379,8 +379,8 @@ public class ErrataFactory extends HibernateFactory {
public static Errata createClone(Org org, Errata e) {
- String baseClonedAdvisoryName = "CL" +
e.getAdvisoryName().substring(3);
- String baseClonedAdvisory = "CL" + e.getAdvisory().substring(3);
+ String baseClonedAdvisoryName = "CL" +
e.getAdvisoryName().substring(2);
+ String baseClonedAdvisory = "CL" + e.getAdvisory().substring(2);
String clonedAdvisory = baseClonedAdvisory;
String clonedAdvisoryName = baseClonedAdvisoryName;
boolean unusedNameFound = false;
diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
index a304a77..15852ce 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java
@@ -333,8 +333,8 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser {
Channel baseChannel = ChannelTestUtils.createBaseChannel(user);
published.addChannel(baseChannel);
Errata clone = ErrataFactory.createClone(user.getOrg(), published);
- String clonedAdvisoryName = "CL" +
published.getAdvisoryName().substring(3);
- String clonedAdvisory = "CL" + published.getAdvisory().substring(3);
+ String clonedAdvisoryName = "CL" +
published.getAdvisoryName().substring(2);
+ String clonedAdvisory = "CL" + published.getAdvisory().substring(2);
assertNotNull(clone.getId());
assertFalse(published.isCloned());
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
index 6b0ffa4..0690e78 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
@@ -107,8 +107,8 @@ public class PublishErrataHelper {
}
- String baseClonedAdvisoryName = "CL" +
original.getAdvisoryName().substring(3);
- String baseClonedAdvisory = "CL" +
original.getAdvisory().substring(3);
+ String baseClonedAdvisoryName = "CL" +
original.getAdvisoryName().substring(2);
+ String baseClonedAdvisory = "CL" +
original.getAdvisory().substring(2);
String clonedAdvisory = baseClonedAdvisory;
String clonedAdvisoryName = baseClonedAdvisoryName;
boolean unusedNameFound = false;
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm
b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 8c19fa5..b295563 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -159,8 +159,8 @@ sub find_next_advisory {
my $suffix = '';
my $i = 1;
- $adv = 'CL' . substr($adv, 3);
- $adv_name = 'CL' . substr($adv_name, 3);
+ $adv = 'CL' . substr($adv, 2);
+ $adv_name = 'CL' . substr($adv_name, 2);
if (advisory_exists($adv) || advisory_name_exists($adv_name)) {
$suffix = sprintf("-%u", $i++);