java/code
by Colin Coe
java/code/src/com/redhat/rhn/domain/errata/CveFactory.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit bd402896a839a77de381c30ab675b49f5f76bbcd
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Tue May 25 20:23:04 2010 +0800
Correct 'checkstyle' errors
diff --git a/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java b/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java
index 37ef309..2ce534f 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java
@@ -14,23 +14,12 @@
*/
package com.redhat.rhn.domain.errata;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.db.datasource.ModeFactory;
-import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
-import com.redhat.rhn.frontend.listview.ListControl;
-import com.redhat.rhn.frontend.listview.PageControl;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.log4j.Logger;
-import org.hibernate.Session;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
/**
* ErrataFactory - the singleton class used to fetch and store
@@ -58,6 +47,7 @@ public class CveFactory extends HibernateFactory {
/**
* Lookup a CVE by name
* @param name Name of CVE to be retrieved
+ * @return CVE object found
*/
public static Cve lookupByName(String name) {
Map params = new HashMap();
13 years, 10 months
2 commits - client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py | 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 013ee43afa07cd7f8b1441e111c98439bd659b1c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 25 13:41:22 2010 +0200
595669 - fix regexp and do not fail if regexp do not match
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhnreg_ks", line 205, in <module>
cli.run()
File "/usr/share/rhn/up2date_client/rhncli.py", line 74, in run
sys.exit(self.main() or 0)
File "/usr/sbin/rhnreg_ks", line 99, in main
hardwareList = hardware.Hardware()
File "/usr/share/rhn/up2date_client/hardware.py", line 667, in Hardware
allhw = get_devices()
File "/usr/share/rhn/up2date_client/hardware_gudev.py", line 93, in
get_devices
result_item['prop1'] = m.group(1) # DEV_HOST
<type 'exceptions.AttributeError'>: 'NoneType' object has no attribute 'group'
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
index b0dcde3..f2cdd37 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
@@ -85,14 +85,15 @@ def get_devices():
if device.has_property('ID_PATH') or device.has_property('DEVPATH'):
if device.has_property('ID_PATH'):
path = device.get_property('ID_PATH')
- m = re.search('.*-scsi-(\d+):(\d+):(\d+):(\d+)', path)
+ m = re.search('.*scsi-(\d+):(\d+):(\d+):(\d+)', path)
else: # device.has_property('DEVPATH')
path = device.get_property('DEVPATH')
m = re.search('.*/(\d+):(\d+):(\d+):(\d+)/block/', path)
- result_item['prop1'] = m.group(1) # DEV_HOST
- result_item['prop2'] = m.group(2) # DEV_ID
- result_item['prop3'] = m.group(3) # DEV_CHANNEL
- result_item['prop4'] = m.group(4) # DEV_LUN
+ if m: # do not fail, if regexp did not match
+ result_item['prop1'] = m.group(1) # DEV_HOST
+ result_item['prop2'] = m.group(2) # DEV_ID
+ result_item['prop3'] = m.group(3) # DEV_CHANNEL
+ result_item['prop4'] = m.group(4) # DEV_LUN
result.append(result_item)
return result
commit 43aff12fd21ff355a52dba7a7dd5ece84363a916
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 25 13:32:49 2010 +0200
whitespace cleanup
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
index cf08a0a..b0dcde3 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
@@ -28,7 +28,6 @@ def get_devices():
'detached' : '0'
'class' : 'OTHER'
'desc' : 'Intel Corporation|5000 Series Chipset PCI Express x4 Port 2'
-
"""
# listen to uevents on all subsystems
client = gudev.Client([""])
13 years, 10 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 -
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 15 +++++++
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 3 -
java/code/src/com/redhat/rhn/domain/channel/ContentSource.java | 18 ---------
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4 +-
java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java | 19 ----------
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 4 +-
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 3 -
9 files changed, 23 insertions(+), 47 deletions(-)
New commits:
commit e9caf228653a8cfa89d65fd71e84b48fd5a4de1e
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 18:45:50 2010 -0400
update channel to handle sync date; remove from content source
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index b235027..1751603 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -28,7 +28,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="maintainerEmail" type="string" column="maint_email"/>
<property name="maintainerPhone" type="string" column="maint_phone"/>
<property name="supportPolicy" type="string" column="support_policy"/>
-
+ <property name="lastSynced" type="timestamp" column="last_synced"/>
<property name="created" column="created" type="timestamp"
insert="false" update="false"/>
<property name="modified" column="modified" type="timestamp"
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index de27e11..04924fb 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -70,6 +70,7 @@ public class Channel extends BaseDomainHelper implements Comparable {
private Long id;
private String label;
private Date lastModified;
+ private Date lastSynced;
private String name;
private String access = PRIVATE;
private Org org;
@@ -302,6 +303,20 @@ public class Channel extends BaseDomainHelper implements Comparable {
}
/**
+ * @return Returns the lastSynced.
+ */
+ public Date getLastSynced() {
+ return lastSynced;
+ }
+
+ /**
+ * @param lastSyncedIn The lastSynced to set.
+ */
+ public void setLastSynced(Date lastSyncedIn) {
+ this.lastSynced = lastSyncedIn;
+ }
+
+ /**
* @return Returns the name.
*/
public String getName() {
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
index 9251f5f..e30feb3 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
@@ -13,8 +13,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</generator>
</id>
- <property name="sourceUrl" type="string" column="source_url"/>
- <property name="lastSynced" type="timestamp" column="last_synced"/>
+ <property name="sourceUrl" type="string" column="source_url"/>
<property name="created" type="timestamp" column="created" insert="false" update="false" />
<property name="modified" type="timestamp" column="modified" insert="false" update="false" />
<property name="label" type="string" column="label"/>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
index 2211195..af87cb1 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.java
@@ -30,8 +30,7 @@ public class ContentSource extends BaseDomainHelper {
private Long id;
private Org org;
private ContentSourceType type;
- private String sourceUrl;
- private Date lastSynced;
+ private String sourceUrl;
private String label;
private Set<Channel> channels = new HashSet<Channel>();
/**
@@ -110,21 +109,6 @@ public class ContentSource extends BaseDomainHelper {
public void setSourceUrl(String sourceUrlIn) {
this.sourceUrl = sourceUrlIn;
}
-
- /**
- * @return Returns the lastSynced.
- */
- public Date getLastSynced() {
- return lastSynced;
- }
-
-
- /**
- * @param lastSyncedIn The lastSynced to set.
- */
- public void setLastSynced(Date lastSyncedIn) {
- this.lastSynced = lastSyncedIn;
- }
/**
*
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 4c928e4..e503aea 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -604,9 +604,9 @@ public class EditChannelAction extends RhnAction implements Listable {
form.set("repo_label", cs.getLabel());
String lastSync = LocalizationService.getInstance().getMessage(
"channel.edit.repo.neversynced");
- if (cs.getLastSynced() != null) {
+ if (c.getLastSynced() != null) {
lastSync = LocalizationService.getInstance().formatDate(
- cs.getLastSynced());
+ c.getLastSynced());
}
request.setAttribute("last_sync", lastSync);
if (ChannelManager.getLatestSyncLogFile(cs,c) != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
index 0afdfa2..0dd693e 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java
@@ -14,8 +14,6 @@
*/
package com.redhat.rhn.frontend.dto;
-import java.util.Date;
-
/**
* ContentSourceDto
@@ -25,25 +23,8 @@ public class ContentSourceDto extends BaseDto {
private Long id;
private String label;
- private Date lastSynced;
-
- /**
- *
- * @return laste date repo was synced
- */
- public Date getLastSynced() {
- return lastSynced;
- }
/**
- *
- * @param lastSyncedIn date to set of last sync
- */
- public void setLastSynced(Date lastSyncedIn) {
- this.lastSynced = lastSyncedIn;
- }
-
- /**
* {@inheritDoc}
*/
public Long getId() {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
index 36bab29..71ae913 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java
@@ -104,8 +104,8 @@ public class ChannelSerializer implements XmlRpcCustomSerializer {
ContentSource cs = c.getSources().iterator().next();
helper.add("yumrepo_source_url", cs.getSourceUrl());
helper.add("yumrepo_label", cs.getLabel());
- if (cs.getLastSynced() != null) {
- helper.add("yumrepo_last_sync", cs.getLastSynced());
+ if (c.getLastSynced() != null) {
+ helper.add("yumrepo_last_sync", c.getLastSynced());
}
else {
helper.add("yumrepo_last_sync", "");
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
index ce11bff..f5e621c 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java
@@ -86,7 +86,7 @@ public class RepoSyncTask implements Job {
try {
Process p = Runtime.getRuntime().exec(
getSyncCommand(src,c).toArray(new String[0]));
- src.setLastSynced(new Date());
+ c.setLastSynced(new Date());
int chr = p.getInputStream().read();
while (chr != -1) {
chr = p.getInputStream().read();
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 4bdf247..9b7955a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -39,9 +39,6 @@
filterattr="label">
<c:out value="<a href=\"/rhn/channel/manage/RepoEdit.do?label=${current.label}\">${current.label}</a>" escapeXml="false" />
</rl:column>
- <rl:column headerkey="repos.jsp.lastsync" styleclass="last-column">
- <c:out value="${current.lastSynced}"/>
- </rl:column>
</rl:list>
</rl:listset>
13 years, 10 months
Branch 'yum-repo-sync' - schema/spacewalk
by Shannon Hughes
schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql | 14 +++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 955e2f8f3a3d30238ae5320f8d19e8455539866b
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 17:51:14 2010 -0400
migrate sync date from repo content source to the channel table
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
index afa0397..a39ab46 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.0-to-spacewalk-schema-1.1/001-repo-sync.sql
@@ -33,22 +33,33 @@ ALTER TABLE rhnContentSource
ADD org_id number
CONSTRAINT rhn_cs_org_fk
REFERENCES WEB_CUSTOMER(id);
+-- add sync column to rhnChannel
+ALTER TABLE rhnChannel
+ ADD last_synced date;
DECLARE
-- grab any rows that need the channel to be migrated to new channel content mapping tbl
CURSOR content is
- select cs.id, cs.channel_id, c.org_id
+ select cs.id, cs.channel_id, cs.last_synced, c.org_id
from rhnContentSource cs, rhnChannel c
where 1=1
AND c.id = cs.channel_id
BEGIN
FOR content_rec IN content
LOOP
+ -- add mapping
INSERT INTO rhnChannelContentSource (source_id, channel_id)
VALUES (content_rec.id, content_rec.channel_id);
+
+ -- save org id
UPDATE rhnConentSource set org_id = content_rec.org_id
WHERE 1=1
AND channel_id = content_rec.channel_id;
+
+ -- migrate sync date to channel
+ UPDATE rhnChannel set last_synced = content_rec.last_synced
+ WHERE id = content_rec.channel_id;
+
END LOOP;
commit;
END;
@@ -56,3 +67,4 @@ END;
-- we don't need the channel_id column anymore since mapping table will handle it
ALTER TABLE rhnContentSource DROP (channel_id);
+ALTER TABLE rhnContentSource DROP (last_synced);
13 years, 10 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1cb44b3b62d0796f1f8d5a5bcf4b8f29a83bf1eb
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 17:41:39 2010 -0400
fix incorrect reference to sync column of content source
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index cc75fa4..4bdf247 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -40,7 +40,7 @@
<c:out value="<a href=\"/rhn/channel/manage/RepoEdit.do?label=${current.label}\">${current.label}</a>" escapeXml="false" />
</rl:column>
<rl:column headerkey="repos.jsp.lastsync" styleclass="last-column">
- <c:out value="${current.sync}"/>
+ <c:out value="${current.lastSynced}"/>
</rl:column>
</rl:list>
</rl:listset>
13 years, 10 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ee3e4933cca3edecad70e48149d67c92d37b775c
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 17:19:10 2010 -0400
adding org id mapping to content source objects
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
index 351cf66..9251f5f 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
@@ -19,7 +19,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<property name="modified" type="timestamp" column="modified" insert="false" update="false" />
<property name="label" type="string" column="label"/>
-
+ <many-to-one name="org"
+ column="org_id"
+ class="com.redhat.rhn.domain.org.OrgImpl"
+ not-null="true" />
<many-to-one
name="type"
class="com.redhat.rhn.domain.channel.ContentSourceType"
13 years, 10 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java | 6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9 +++------
java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java | 3 ++-
java/code/webapp/WEB-INF/struts-config.xml | 5 ++---
4 files changed, 10 insertions(+), 13 deletions(-)
New commits:
commit f63b3bf7b9be64b8764ad2ca8d9f80700496cd9b
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 17:02:12 2010 -0400
ise fixes for repo create
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
index 4f7764f..ff15cbf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
@@ -49,7 +49,7 @@ public class RepoDetailsAction extends RhnAction {
public static final String REPO = "repo";
public static final String URL = "url";
public static final String LABEL = "label";
- public static final String OLD_LABEL = "old_label";
+ public static final String OLD_LABEL = "oldLabel";
private static final String VALIDATION_XSD =
"/com/redhat/rhn/frontend/action/channel/" +
@@ -79,11 +79,11 @@ public class RepoDetailsAction extends RhnAction {
ContentSource repo = submit(request, form);
if (isCreateMode(request)) {
createSuccessMessage(request,
- "repo.create.success", repo.getLabel());
+ "repos.jsp.create.success", repo.getLabel());
}
else {
createSuccessMessage(request,
- "repo.update.success", repo.getLabel());
+ "repos.jsp.update.success", repo.getLabel());
}
request.removeAttribute(CREATE_MODE);
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 b8ce58d..d3f6d7a 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
@@ -9223,9 +9223,6 @@ Please note that some manual configuration of these scripts may still be require
</group>
<!-- Repo Sync -->
- <trans-unit id="repos.jsp.toolbar">
- <source>Repository</source>
- </trans-unit>
<trans-unit id="repos.jsp.summary">
<source>Summary for repos here</source>
</trans-unit>
@@ -9253,9 +9250,6 @@ Please note that some manual configuration of these scripts may still be require
<trans-unit id="repos.jsp.header2">
<source>Create Repository</source>
</trans-unit>
- <trans-unit id="repos.jsp.header2">
- <source>Create Repository</source>
- </trans-unit>
<trans-unit id="repos.jsp.create.label">
<source>Repository Label</source>
</trans-unit>
@@ -9268,6 +9262,9 @@ Please note that some manual configuration of these scripts may still be require
<trans-unit id="repos.jsp.update.submit">
<source>Create Repository</source>
</trans-unit>
+ <trans-unit id="repos.jsp.create.success">
+ <source>Repository created successfully</source>
+ </trans-unit>
<!-- TNC -->
diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
index f9c1c73..7b90c27 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
@@ -113,7 +113,8 @@ public class CreateRepoCommand {
ContentSource repo = ChannelFactory.createRepo();
repo.setLabel(this.label);
repo.setSourceUrl(this.url);
- repo.setOrg(this.org);
+ repo.setOrg(this.org);
+ repo.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM);
ChannelFactory.save(repo);
this.newRepo = repo;
}
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index a88818e..2d7bb87 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -821,6 +821,7 @@
<form-bean name="contentSourceForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
<form-property name="url" type="java.lang.String"/>
+ <form-property name="oldLabel" type="java.lang.String" />
<form-property name="label" type="java.lang.String"/>
</form-bean>
@@ -6618,11 +6619,10 @@
parameter="create_mode"
type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
<forward name="default"
path="/WEB-INF/pages/channel/manage/repo/repodetails.jsp"/>
<forward name="success"
- path="/channels/manage/repo/RepoEdit.do" redirect = "true"
+ path="/channels/manage/repos/RepoEdit.do" redirect = "true"
/>
</action>
@@ -6632,7 +6632,6 @@
parameter="edit_mode"
type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
<forward name="default"
path="/WEB-INF/pages/channel/manage/repo/repodetails.jsp"/>
<forward name="success"
13 years, 10 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ++++
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp | 13 ++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit aa6d3c91993942fa2ce2c4068a861443faf50dd0
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 16:09:50 2010 -0400
adding url field to repo details form/jsp
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 f5f6f87..b8ce58d 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
@@ -9262,6 +9262,12 @@ Please note that some manual configuration of these scripts may still be require
<trans-unit id="repos.jsp.create.url">
<source>Repository URL</source>
</trans-unit>
+ <trans-unit id="repos.jsp.create.submit">
+ <source>Create Repository</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.update.submit">
+ <source>Create Repository</source>
+ </trans-unit>
<!-- TNC -->
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 8e7b356..69362bf 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -48,7 +48,16 @@
<html:hidden property="oldLabel"/>
</c:if>
</td>
+ </tr>
+ <tr>
+ <th>
+ <rhn:required-field key = "repos.jsp.create.url"/>
+ </th>
+ <td>
+ <html:text property="url"/>
+ </td>
</tr>
+
</table>
<hr />
@@ -58,10 +67,10 @@
<td></td>
<c:choose>
<c:when test = "${empty requestScope.create_mode}">
- <td align="right"><html:submit><bean:message key="snippetupdate.jsp.submit"/></html:submit></td>
+ <td align="right"><html:submit><bean:message key="repos.jsp.update.submit"/></html:submit></td>
</c:when>
<c:otherwise>
- <td align="right"><html:submit><bean:message key="snippetcreate.jsp.submit"/></html:submit></td>
+ <td align="right"><html:submit><bean:message key="repos.jsp.create.submit"/></html:submit></td>
</c:otherwise>
</c:choose>
</tr>
13 years, 10 months
Branch 'flex-guest' - 11 commits - backend/satellite_tools backend/server client/rhel client/solaris java/code rel-eng/packages
by Partha Aji
backend/satellite_tools/reposync.py | 3
backend/server/rhnLib.py | 2
client/rhel/rhn-client-tools/data/Makefile | 19 +-
client/rhel/rhn-client-tools/data/gui.glade | 16 +-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2
client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py | 17 +-
client/solaris/smartpm/build.py.props | 3
client/solaris/smartpm/smartpm.spec | 9 -
java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml | 6
java/code/src/com/redhat/rhn/domain/errata/CveFactory.java | 76 ++++++++++
java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml | 4
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 11 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 23 ++-
rel-eng/packages/smartpm | 2
15 files changed, 169 insertions(+), 31 deletions(-)
New commits:
commit aa2d94f10defa2e6e9a7fe8fda16bf0a6017a0f1
Merge: ce3adec... 8c3dfa3...
Author: Partha Aji <paji(a)redhat.com>
Date: Mon May 24 12:31:29 2010 -0400
Merge branch 'master' into flex-guest
commit 8c3dfa382410941995ca798e85343a30ada1bdb2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 24 15:12:44 2010 +0200
We don't need hwdata target anymore
This is to avoid build errors:
make[2]: *** No rule to make target `hwdata.py', needed by `all'. Stop.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index 876ba03..6f060e7 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -4,7 +4,7 @@
# rhn-client-tools and not here.
FILES := config gui hardware progress \
- haltree hardware_hal hardware_gudev hwdata \
+ haltree hardware_hal hardware_gudev \
up2dateUtils getMethod tui \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
commit c9ff354a333b038ffa5e86014072cbeebcb2e6ee
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon May 24 15:12:25 2010 +0200
580493 - use correct product logos in rhn_register (gui)
diff --git a/client/rhel/rhn-client-tools/data/Makefile b/client/rhel/rhn-client-tools/data/Makefile
index 427fd24..bbbbc6f 100644
--- a/client/rhel/rhn-client-tools/data/Makefile
+++ b/client/rhel/rhn-client-tools/data/Makefile
@@ -25,9 +25,20 @@ INSTALL = install -p --verbose
INSTALL_DIR = $(INSTALL) -m 755 -d
INSTALL_DATA = $(INSTALL) -m 644
-# Handy defines
-PIXMAPS = /usr/share/firstboot/pixmaps/
-SHADOWMAN = shadowman-round-48.png
+# Fedora
+ifeq ($(shell test -f /usr/share/icons/hicolor/48x48/apps/fedora-logo-icon.png && echo "exists" ), exists)
+LOGO = /usr/share/icons/hicolor/48x48/apps/fedora-logo-icon.png
+endif
+
+# RHEL-5
+ifeq ($(shell test -f /usr/share/pixmaps/redhat/shadowman-round-48.png && echo "exists" ), exists)
+LOGO = /usr/share/pixmaps/redhat/shadowman-round-48.png
+endif
+
+# RHEL-6
+ifeq ($(shell test -f /usr/share/icons/hicolor/48x48/apps/system-logo-icon.png && echo "exists" ), exists)
+LOGO = /usr/share/icons/hicolor/48x48/apps/system-logo-icon.png
+endif
# For subdirs, required exports
@@ -48,7 +59,7 @@ install:: $(DIRS)
$(INSTALL_DATA) up2date-icons/48x48/up2date.png $(PNG48_DIR)/
# this is lame and should be dealt with in the code
- sed -i -e "s|$(SHADOWMAN)|$(PIXMAPS)/$(SHADOWMAN)|g" \
+ sed -i -e "s|@@logo@@|$(LOGO)|g" \
$(RHNSHARE_DIR)/up2date_client/*glade
# This sucks. We should be able to use PIXMAP_DIR, but then when making
# an rpm prefix is set to something different than where it'll be when
diff --git a/client/rhel/rhn-client-tools/data/gui.glade b/client/rhel/rhn-client-tools/data/gui.glade
index cf2cacc..af92d0f 100644
--- a/client/rhel/rhn-client-tools/data/gui.glade
+++ b/client/rhel/rhn-client-tools/data/gui.glade
@@ -33,7 +33,7 @@
<widget class="GnomeDruidPageStandard" id="startPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Registering for software updates</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onStartPageNext"/>
<signal name="prepare" handler="onStartPagePrepare"/>
@@ -56,7 +56,7 @@
<widget class="GnomeDruidPageStandard" id="chooseServerPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Choose an update location</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onChooseServerPageNext"/>
<signal name="back" handler="onChooseServerPageBack"/>
<signal name="prepare" handler="onChooseServerPagePrepare"/>
@@ -80,7 +80,7 @@
<widget class="GnomeDruidPageStandard" id="loginPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Enter your account information</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onLoginPageNext"/>
<signal name="back" handler="onLoginPageBack"/>
<signal name="prepare" handler="onLoginPagePrepare"/>
@@ -104,7 +104,7 @@
<widget class="GnomeDruidPageStandard" id="chooseChannelPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Select operating system release</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onChooseChannelPageNext" last_modification_time="Fri, 22 Jun 2007 16:04:40 GMT"/>
<signal name="back" handler="onChooseChannelPageBack" last_modification_time="Fri, 22 Jun 2007 16:05:05 GMT"/>
<signal name="prepare" handler="onChooseChannelPagePrepare" last_modification_time="Fri, 22 Jun 2007 18:48:33 GMT"/>
@@ -128,7 +128,7 @@
<widget class="GnomeDruidPageStandard" id="createProfilePage">
<property name="visible">True</property>
<property name="title" translatable="yes">Create your system profile</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onCreateProfilePageNext"/>
<signal name="back" handler="onCreateProfilePageBack"/>
<signal name="prepare" handler="onCreateProfilePagePrepare"/>
@@ -152,7 +152,7 @@
<widget class="GnomeDruidPageStandard" id="reviewSubscriptionPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Review system subscription details</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onReviewSubscriptionPageNext"/>
<signal name="prepare" handler="onReviewSubscriptionPagePrepare"/>
@@ -175,7 +175,7 @@
<widget class="GnomeDruidPageStandard" id="provideCertificatePage">
<property name="visible">True</property>
<property name="title" translatable="yes">Provide a security certificate</property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="next" handler="onProvideCertificatePageNext"/>
<signal name="back" handler="onProvideCertificatePageBack"/>
@@ -198,7 +198,7 @@
<widget class="GnomeDruidPageStandard" id="finishPage">
<property name="visible">True</property>
<property name="title" translatable="yes"></property>
- <property name="logo">shadowman-round-48.png</property>
+ <property name="logo">@@logo@@</property>
<signal name="finish" handler="onFinishPageFinish"/>
<signal name="prepare" handler="onFinishPagePrepare"/>
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d84b63b..25c8dc0 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -36,6 +36,13 @@ BuildRequires: gettext
BuildRequires: intltool
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
+BuildRequires: fedora-logos
+%endif
+%if 0%{?rhel} > 4
+BuildRequires: redhat-logos
+%endif
+
# The following BuildRequires are for check only
%if 0%{?fedora} >= 12
BuildRequires: python-coverage
commit e214d2a7ef9eda39c1bdc8f591b4ed5eda084212
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 24 14:05:56 2010 +0200
Automatic commit of package [smartpm] minor release [0.2-3].
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec
index 88f910b..9e6f51b 100644
--- a/client/solaris/smartpm/smartpm.spec
+++ b/client/solaris/smartpm/smartpm.spec
@@ -11,7 +11,7 @@ Name: smartpm
Source0: smartpm-%{version}.tar.gz
Epoch: 1
Version: 0.2
-Release: 2
+Release: 3
License: GPLv2
Group: Applications/System
URL: http://www.smartpm.org/
@@ -60,6 +60,10 @@ env %{__python} setup.py build
%{python_sitearch}/rhn/actions/solarispkgs.py*
%changelog
+* Mon May 24 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.2-3
+- return smartpm back to 0.2 version and bump up epoch
+- 555659 - do not freak out when SUNW_PATCHID do not have SUN format
+
* Mon Apr 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.5-1
- updated copyrights
diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm
index 7b6a387..bcdb31b 100644
--- a/rel-eng/packages/smartpm
+++ b/rel-eng/packages/smartpm
@@ -1 +1 @@
-0.5-1 client/solaris/smartpm/
+0.2-3 client/solaris/smartpm/
commit bec9de64902ff9a193944723ab9d3b2e1b051bf7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 24 14:05:31 2010 +0200
return smartpm back to 0.2 version
smartpm we use is version 0.2, we should never bump up the version
we should bump up release
diff --git a/client/solaris/smartpm/build.py.props b/client/solaris/smartpm/build.py.props
new file mode 100644
index 0000000..ccc90ea
--- /dev/null
+++ b/client/solaris/smartpm/build.py.props
@@ -0,0 +1,3 @@
+[buildconfig]
+tagger = spacewalk.releng.tagger.ReleaseTagger
+
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec
index 6892047..88f910b 100644
--- a/client/solaris/smartpm/smartpm.spec
+++ b/client/solaris/smartpm/smartpm.spec
@@ -9,8 +9,9 @@
Summary: Next generation package handling tool
Name: smartpm
Source0: smartpm-%{version}.tar.gz
-Version: 0.5
-Release: 1
+Epoch: 1
+Version: 0.2
+Release: 2
License: GPLv2
Group: Applications/System
URL: http://www.smartpm.org/
commit 517914a0881a0b32a8a2342eb76d75f3f221606e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 24 11:57:38 2010 +0200
557059 - do not fail on IBM-ESXS controler where ID_PATH is not set
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
index 040f6af..cf08a0a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
@@ -83,12 +83,17 @@ def get_devices():
result_item['prop2'] = device.get_property('ID_MODEL_ID')
if device.has_property('ID_BUS') and device.get_property('ID_BUS') == 'scsi':
- path = device.get_property('ID_PATH')
- m = re.search('.*-scsi-(\d+):(\d+):(\d+):(\d+)', path)
- result_item['prop1'] = m.group(1) # DEV_HOST
- result_item['prop2'] = m.group(2) # DEV_ID
- result_item['prop3'] = m.group(3) # DEV_CHANNEL
- result_item['prop4'] = m.group(4) # DEV_LUN
+ if device.has_property('ID_PATH') or device.has_property('DEVPATH'):
+ if device.has_property('ID_PATH'):
+ path = device.get_property('ID_PATH')
+ m = re.search('.*-scsi-(\d+):(\d+):(\d+):(\d+)', path)
+ else: # device.has_property('DEVPATH')
+ path = device.get_property('DEVPATH')
+ m = re.search('.*/(\d+):(\d+):(\d+):(\d+)/block/', path)
+ result_item['prop1'] = m.group(1) # DEV_HOST
+ result_item['prop2'] = m.group(2) # DEV_ID
+ result_item['prop3'] = m.group(3) # DEV_CHANNEL
+ result_item['prop4'] = m.group(4) # DEV_LUN
result.append(result_item)
return result
commit 55eacc4dd8dca55038e6b48b45eb5f7fc3e981fa
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Sat May 22 00:14:15 2010 +0800
Update errata.setDetails to allow setting CVEs
diff --git a/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
index 322bef9..b877e4b 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/Cve.hbm.xml
@@ -13,4 +13,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</id>
<property name="name" column="name" type="string" length="13" />
</class>
-</hibernate-mapping>
\ No newline at end of file
+ <query name="Cve.lookupByName">
+ <![CDATA[from com.redhat.rhn.domain.errata.Cve as cve
+ where cve.name = :name]]>
+ </query>
+</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java b/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java
new file mode 100644
index 0000000..37ef309
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/domain/errata/CveFactory.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2009--2010 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.domain.errata;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.db.datasource.ModeFactory;
+import com.redhat.rhn.common.db.datasource.SelectMode;
+import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.frontend.listview.ListControl;
+import com.redhat.rhn.frontend.listview.PageControl;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.log4j.Logger;
+import org.hibernate.Session;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * ErrataFactory - the singleton class used to fetch and store
+ * com.redhat.rhn.domain.errata.Errata objects from the
+ * database.
+ * @version $Rev$
+ */
+public class CveFactory extends HibernateFactory {
+
+ private static CveFactory singleton = new CveFactory();
+ private static Logger log = Logger.getLogger(CveFactory.class);
+
+ private CveFactory() {
+ super();
+ }
+
+ /**
+ * Get the Logger for the derived class so log messages
+ * show up on the correct class
+ */
+ protected Logger getLogger() {
+ return log;
+ }
+
+ /**
+ * Lookup a CVE by name
+ * @param name Name of CVE to be retrieved
+ */
+ public static Cve lookupByName(String name) {
+ Map params = new HashMap();
+ params.put("name", name);
+ return (Cve)singleton.lookupObjectByNamedQuery("Cve.lookupByName", params);
+ }
+
+ /**
+ * Insert or Update a CVE.
+ * @param cve CVE to be stored in database.
+ */
+ public static void save(Cve cve) {
+ singleton.saveObject(cve);
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 98fc044..da694e3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -22,6 +22,8 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
import com.redhat.rhn.domain.errata.Bug;
+import com.redhat.rhn.domain.errata.Cve;
+import com.redhat.rhn.domain.errata.CveFactory;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.ErrataFactory;
import com.redhat.rhn.domain.errata.Keyword;
@@ -282,6 +284,9 @@ public class ErrataHandler extends BaseHandler {
* #prop_desc("array", "keywords", "'keywords' is the key into the struct")
* #array_single("string", "keyword - List of keywords to associate
* with the errata.")
+ * #prop_desc("array", "CVEs", "'cves' is the key into the struct")
+ * #array_single("string", "cves - List of CVEs to associate
+ * with the errata.")
* #struct_end()
*
* @xmlrpc.returntype #return_int_success()
@@ -302,6 +307,7 @@ public class ErrataHandler extends BaseHandler {
validKeys.add("solution");
validKeys.add("bugs");
validKeys.add("keywords");
+ validKeys.add("cves");
validateMap(validKeys, details);
validKeys.clear();
@@ -387,6 +393,21 @@ public class ErrataHandler extends BaseHandler {
errata.addKeyword(keyword);
}
}
+ if (details.containsKey("cves")) {
+ if (errata.getCves() != null) {
+ errata.getCves().clear();
+ HibernateFactory.getSession().flush();
+ }
+ for (String cveName : (ArrayList<String>) details.get("cves")) {
+ Cve c = CveFactory.lookupByName(cveName);
+ if (c == null) {
+ c = new Cve();
+ c.setName(cveName);
+ CveFactory.save(c);
+ }
+ errata.getCves().add(c);
+ }
+ }
// ALWAYS change the advisory to match, as we do in the UI.
errata.setAdvisory(errata.getAdvisoryName() + "-" +
@@ -394,7 +415,7 @@ public class ErrataHandler extends BaseHandler {
//Save the errata
ErrataManager.storeErrata(errata);
-
+
return 1;
}
commit 42eac072517650377ee76564f92623c34deb2662
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Wed May 19 22:15:38 2010 +0800
Allow CVEs to be set on unpublished errata
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
index 029cb6c..6532a93 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
@@ -61,6 +61,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<many-to-many class="com.redhat.rhn.domain.rhnpackage.Package"
column="package_id"/>
</set>
+ <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>
<joined-subclass
name="com.redhat.rhn.domain.errata.impl.UnpublishedClonedErrata"
table="rhnErrataClonedTmp">
commit 374d06dc0e64334ee4e5445d5879c0857f92bda2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 20 16:42:02 2010 +0200
string.maketrans("", "") sounds like a great plan...
diff --git a/backend/server/rhnLib.py b/backend/server/rhnLib.py
index 6f06df6..53e52e7 100644
--- a/backend/server/rhnLib.py
+++ b/backend/server/rhnLib.py
@@ -28,7 +28,7 @@ from rhnMapping import check_package_arch
# Utility function that removes \n\r from a string
def removeNewlines(str):
# Remove \n and \r from the string str
- return string.translate(str, string.maketrans("", ""), "\n\r")
+ return string.translate(str, None, "\n\r")
def computeSignature(*fields):
# Init the hash
commit 4fea33f33cd851500c53fa63385e3e3cc0e34851
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 20 16:03:29 2010 +0200
let's check repo only once
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index cbb657f..0ec6517 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -137,6 +137,7 @@ class RepoSync:
if len(to_download) == 0:
self.print_msg("No new packages to download.")
+ is_non_local_repo = (self.url.find("file://") < 0)
for (index, pack) in enumerate(to_download):
"""download each package"""
# try/except/finally doesn't work in python 2.4 (RHEL5), so here's a hack
@@ -155,7 +156,7 @@ class RepoSync:
raise
continue
finally:
- if self.url.find("file://") < 0:
+ if is_non_local_repo:
os.remove(path)
def upload_package(self, package, path):
commit 5e63202fa9be8adc5e54e1573384ff7a2050ef79
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu May 20 13:56:28 2010 -0400
585176 - fixing issue where packages were excluded from update on SSM upgradable packages page when the packages had multiple arches
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
index baad10b..5bdaeb2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageListItem;
import com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent;
@@ -107,13 +108,13 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
// bz465892 - As the selected packages are parsed, remove duplicates
// keeping the highest EVR
- Map<Long, PackageListItem> packageNameIdsToItems =
- new HashMap<Long, PackageListItem>(data.size());
+ Map<String, PackageListItem> packageNameIdsToItems =
+ new HashMap<String, PackageListItem>(data.size());
for (String idCombo : data) {
PackageListItem item = PackageListItem.parse(idCombo);
- PackageListItem existing = packageNameIdsToItems.get(item.getIdOne());
+ PackageListItem existing = packageNameIdsToItems.get(item.getIdOne() + "|"+ item.getIdThree());
if (existing != null) {
String[] existingParts = splitEvr(existing.getNvre());
String[] itemParts = splitEvr(item.getNvre());
@@ -129,11 +130,11 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
itemEvr.setRelease(itemParts[2]);
if (existingEvr.compareTo(itemEvr) < 0) {
- packageNameIdsToItems.put(item.getIdOne(), item);
+ packageNameIdsToItems.put(item.getIdOne() + "|"+ item.getIdThree(), item);
}
}
else {
- packageNameIdsToItems.put(item.getIdOne(), item);
+ packageNameIdsToItems.put(item.getIdOne() + "|"+ item.getIdThree(), item);
}
}
13 years, 10 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 17 ++++------
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 49c09c532518cd1368ff7bed1d1dc5f1a4ac5667
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon May 24 12:26:15 2010 -0400
checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
index 5bdaeb2..1c3319c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
@@ -15,17 +15,14 @@
package com.redhat.rhn.frontend.action.rhnpackage.ssm;
import com.redhat.rhn.common.db.datasource.DataResult;
-
import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.common.util.DatePicker;
import com.redhat.rhn.domain.rhnpackage.PackageEvr;
import com.redhat.rhn.domain.rhnset.RhnSet;
-import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.rhnset.RhnSetElement;
+import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageListItem;
-
import com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
@@ -40,7 +37,6 @@ import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.system.SystemManager;
import org.apache.commons.lang.StringUtils;
-
import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -49,12 +45,12 @@ import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.ArrayList;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -114,7 +110,8 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
for (String idCombo : data) {
PackageListItem item = PackageListItem.parse(idCombo);
- PackageListItem existing = packageNameIdsToItems.get(item.getIdOne() + "|"+ item.getIdThree());
+ PackageListItem existing =
+ packageNameIdsToItems.get(item.getIdOne() + "|" + item.getIdThree());
if (existing != null) {
String[] existingParts = splitEvr(existing.getNvre());
String[] itemParts = splitEvr(item.getNvre());
@@ -130,11 +127,13 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
itemEvr.setRelease(itemParts[2]);
if (existingEvr.compareTo(itemEvr) < 0) {
- packageNameIdsToItems.put(item.getIdOne() + "|"+ item.getIdThree(), item);
+ packageNameIdsToItems.put(item.getIdOne() + "|" +
+ item.getIdThree(), item);
}
}
else {
- packageNameIdsToItems.put(item.getIdOne() + "|"+ item.getIdThree(), item);
+ packageNameIdsToItems.put(item.getIdOne() + "|" +
+ item.getIdThree(), item);
}
}
13 years, 10 months