java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 115 ----------
1 file changed, 8 insertions(+), 107 deletions(-)
New commits:
commit 11ed84d2410fe2b1e3410f0a3c28f0db9630e627
Author: Aron Parsons <aparsons(a)redhat.com>
Date: Mon Sep 27 09:44:51 2010 -0400
Revert "591291 - added new API calls
channel.software.mergeErrataWithPackages"
This reverts commit aecf408bd48b53e672560c1daa2dcf3257d5e90b.
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 0cf38f7..74979bd 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1826,12 +1826,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
*/
public Object[] mergeErrata(String sessionKey, String mergeFromLabel,
String mergeToLabel) {
- return mergeErrata(sessionKey, mergeFromLabel, mergeToLabel, false);
- }
-
- private Object[] mergeErrata(String sessionKey, String mergeFromLabel,
- String mergeToLabel, boolean addPackages) {
-
User loggedInUser = getLoggedInUser(sessionKey);
channelAdminPermCheck(loggedInUser);
@@ -1844,7 +1838,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
Set<Errata> mergedErrata =
mergeErrataToChannel(loggedInUser, new HashSet(mergeFrom.getErratas()),
- mergeTo, mergeFrom, addPackages);
+ mergeTo, mergeFrom);
return mergedErrata.toArray();
}
@@ -1874,13 +1868,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
*/
public Object[] mergeErrata(String sessionKey, String mergeFromLabel,
String mergeToLabel, String startDate, String endDate) {
- return mergeErrata(sessionKey, mergeFromLabel, mergeToLabel,
- startDate, endDate, false);
- }
-
- private Object[] mergeErrata(String sessionKey, String mergeFromLabel,
- String mergeToLabel, String startDate, String endDate, boolean addPackages)
{
-
User loggedInUser = getLoggedInUser(sessionKey);
channelAdminPermCheck(loggedInUser);
@@ -1895,75 +1882,20 @@ public class ChannelSoftwareHandler extends BaseHandler {
loggedInUser.getOrg(), mergeFrom, startDate, endDate);
Set<Errata> mergedErrata =
- mergeErrataToChannel(loggedInUser, new HashSet(fromErrata),
- mergeTo, mergeFrom, addPackages);
+ mergeErrataToChannel(loggedInUser, new HashSet(fromErrata), mergeTo,
mergeFrom);
return mergedErrata.toArray();
}
/**
- * Merge a channel's errata into another channel and adds the packages
- * @param sessionKey session of the user
- * @param mergeFromLabel the label of the channel to pull the errata from
- * @param mergeToLabel the label of the channel to push errata into
- * @return A list of errata that were merged.
- *
- * @xmlrpc.doc Merges all errata from one channel into another and adds the packages
- * @xmlrpc.param #session_key()
- * @xmlrpc.param #param_desc("string", "mergeFromLabel",
"the label of the
- * channel to pull errata from")
- * @xmlrpc.param #param_desc("string", "mergeToLabel", "the
label to push the
- * errata into")
- * @xmlrpc.returntype
- * #array()
- * $ErrataSerializer
- * #array_end()
- */
- public Object[] mergeErrataWithPackages(String sessionKey, String mergeFromLabel,
- String mergeToLabel) {
- return mergeErrata(sessionKey, mergeFromLabel, mergeToLabel, true);
- }
-
- /**
- * Merge a channel's errata into another channel
- * based upon a given start/end date and add the packages
- * @param sessionKey session of the user
- * @param mergeFromLabel the label of the channel to pull the errata from
- * @param mergeToLabel the label of the channel to push errata into
- * @param startDate begin date
- * @param endDate end date
- * @return A list of errata that were merged.
- *
- * @xmlrpc.doc Merges all errata from one channel into another based upon a
- * given start/end date.
- * @xmlrpc.param #session_key()
- * @xmlrpc.param #param_desc("string", "mergeFromLabel",
"the label of the
- * channel to pull errata from")
- * @xmlrpc.param #param_desc("string", "mergeToLabel", "the
label to push the
- * errata into")
- * @xmlrpc.param #param("string", "startDate")
- * @xmlrpc.param #param("string", "endDate")
- * @xmlrpc.returntype
- * #array()
- * $ErrataSerializer
- * #array_end()
- */
- public Object[] mergeErrataWithPackages(String sessionKey, String mergeFromLabel,
- String mergeToLabel, String startDate, String endDate) {
- return mergeErrata(sessionKey, mergeFromLabel,
- mergeToLabel, startDate, endDate, true);
- }
-
- /**
- * Merge a list of errata from one channel into another channel and adds the
packages
+ * Merge a list of errata from one channel into another channel
* @param sessionKey session of the user
* @param mergeFromLabel the label of the channel to pull the errata from
* @param mergeToLabel the label of the channel to push errata into
* @param errataNames the list of errata to merge
* @return A list of errata that were merged.
*
- * @xmlrpc.doc Merges a list of errata from one channel into another and
- * adds the affected packages to the destination channel
+ * @xmlrpc.doc Merges a list of errata from one channel into another
* @xmlrpc.param #session_key()
* @xmlrpc.param #param_desc("string", "mergeFromLabel",
"the label of the
* channel to pull errata from")
@@ -1976,7 +1908,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
* $ErrataSerializer
* #array_end()
*/
- public Object[] mergeErrataWithPackages(String sessionKey, String mergeFromLabel,
+ public Object[] mergeErrata(String sessionKey, String mergeFromLabel,
String mergeToLabel, List errataNames) {
User loggedInUser = getLoggedInUser(sessionKey);
@@ -2005,13 +1937,13 @@ public class ChannelSoftwareHandler extends BaseHandler {
}
Set<Errata> mergedErrata =
- mergeErrataToChannel(loggedInUser, errataToMerge, mergeTo, mergeFrom, true);
+ mergeErrataToChannel(loggedInUser, errataToMerge, mergeTo, mergeFrom);
return mergedErrata.toArray();
}
private Set<Errata> mergeErrataToChannel(User user, Set<Errata>
errataToMerge,
- Channel toChannel, Channel fromChannel, boolean addPackages) {
+ Channel toChannel, Channel fromChannel) {
// find errata that we do not need to merge
List<Errata> same = ErrataManager.listSamePublishedInChannels(
@@ -2028,38 +1960,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
ErrataManager.publishErrataToChannelAsync(toChannel,
getErrataIds(errataToMerge), user);
- // add packages to the channel if requested
- if (addPackages) {
- List<Long> packagesToAdd = new ArrayList();
-
- List<Long> fromChannelPkgs =
ChannelFactory.getPackageIds(fromChannel.getId());
-
- for (Errata erratum : errataToMerge) {
- Set<Package> erratumPackageList = erratum.getPackages();
-
- for (Package pkg : erratumPackageList) {
- // if the package is in the source channel, add it to the
destination
- if (fromChannelPkgs.contains(pkg.getId())) {
- packagesToAdd.add(pkg.getId());
- }
- }
- }
-
- // add the packages to the destination channel
- ChannelManager.addPackages(toChannel, packagesToAdd, user);
-
- // refresh the channel
- ChannelManager.refreshWithNewestPackages(toChannel, "api");
-
- // Mark the affected channel to have it's metadata evaluated, where
necessary
- // (RHEL5+, mostly)
- ChannelManager.queueChannelChange(toChannel.getLabel(),
- "java::mergeErrataToChannel",
user.getLogin());
-
- List<Long> cids = new ArrayList();
- cids.add(toChannel.getId());
- ErrataCacheManager.insertCacheForChannelPackagesAsync(cids, packagesToAdd);
- }
+ // no need to regenerate errata cache, because we didn't touch any packages
return errataToMerge;
}