java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml |
2 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java |
6 ++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java |
2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java |
14 +++-------
web/modules/rhn/RHN/DB/ErrataEditor.pm |
11 +++++++
5 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 6e11c28ffdb97af10ff255cbd3c15ffda285d2bd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 15:02:14 2009 +0100
checksyle issue
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
index 9ec56a4..818c07a 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
@@ -94,9 +94,9 @@ public class ConfirmErrataAction extends RhnListAction {
Long sourceCid = null;
Channel srcChan = null;
- String sel_channel = request.getParameter(SELECTED_CHANNEL);
- if ((sel_channel != null) && (sel_channel != "")) {
- sourceCid = Long.parseLong(sel_channel);
+ String selChannel = request.getParameter(SELECTED_CHANNEL);
+ if ((selChannel != null) && (selChannel != "")) {
+ sourceCid = Long.parseLong(selChannel);
srcChan = ChannelFactory.lookupByIdAndUser(sourceCid, user);
}
commit caff25c7259f6244e04c85e45bff5f5d148e1244
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 12:01:34 2009 +0100
537094 - yum list-sec CVE's on cloned channels doesn't work
contains perl and java changes
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
index ddf7c66..b305f66 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
@@ -46,7 +46,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<one-to-many
class="com.redhat.rhn.domain.errata.impl.PublishedBug"/>
</set>
- <set name="cves" lazy="true" inverse="true"
cascade="all-delete-orphan" table="rhnErrataCve">
+ <set name="cves" lazy="true"
cascade="all-delete-orphan" table="rhnErrataCve">
<key column="errata_id"/>
<many-to-many column="cve_id"
class="com.redhat.rhn.domain.errata.Cve" />
</set>
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 94af7e3..f18f942 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
@@ -85,8 +85,8 @@ public class PublishErrataHelper {
clone.setLocallyModified(original.getLocallyModified());
clone.setLastModified(original.getLastModified());
clone.setOrg(org);
+ clone.getCves().addAll(original.getCves());
-
clone.setPackages(new HashSet(original.getPackages()));
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm
b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 35f852e..f2ba79a 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -166,6 +166,17 @@ EOQ
$sth = $dbh->prepare($query);
$sth->execute_h(temp_eid => $temp_eid);
+ $query =<<EOQ;
+INSERT INTO rhnErrataCve
+ (errata_id, cve_id)
+ (SELECT ECL.id, EC.cve_id
+ FROM rhnErrataCVE EC, rhnErrataCloned ECL
+ WHERE ECL.original_id = EC.errata_id
+ AND ECL.id = :new_eid)
+EOQ
+ $sth = $dbh->prepare($query);
+ $sth->execute_h(new_eid => $new_eid);
+
my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $new_eid);
$errata->refresh_erratafiles();
commit af1cc6479fd162467a2c9b28858cd2123689b782
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 14:58:56 2009 +0100
fixing checksum empty string in the repo metadata
client wasn't able to get repo metada with "Error performing checksum"
+ removing one variable
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index 5bba05d..22c4f82 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -56,7 +56,6 @@ public class RepositoryWriter {
private String pathPrefix;
private String mountPoint;
private String checksumtype;
- private String checksumname = null;
/**
* Constructor takes in pathprefix and mountpoint
@@ -106,9 +105,6 @@ public class RepositoryWriter {
// Get compatible checksumType
this.checksumtype = channel.getChecksumType();
- if (channel.getChecksum() != null) {
- this.checksumname = channel.getChecksum().getDescription();
- }
log.info("Checksum Type Value" + this.checksumtype);
@@ -190,15 +186,15 @@ public class RepositoryWriter {
RepomdIndexData groupsData = loadCompsFile(channel);
//Set the type so yum can read and perform checksum
- primaryData.setType(this.checksumname);
- filelistsData.setType(this.checksumname);
- otherData.setType(this.checksumname);
+ primaryData.setType(this.checksumtype);
+ filelistsData.setType(this.checksumtype);
+ otherData.setType(this.checksumtype);
if (updateinfoData != null) {
- updateinfoData.setType(this.checksumname);
+ updateinfoData.setType(this.checksumtype);
}
if (groupsData != null) {
- groupsData.setType(this.checksumname);
+ groupsData.setType(this.checksumtype);
}
log.info("Primary xml's type" + primaryData.getType());
Show replies by date