java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java | 18 +++++----- 1 file changed, 10 insertions(+), 8 deletions(-)
New commits: commit 2790b43dbc17d462f72aebb3540dfff8112e997b Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 24 16:12:32 2012 +0200
815804 - force repo regeneration, when removing package using packages.removePackage API
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index ef0a531..31760a2 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -26,6 +26,7 @@ import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.util.CompressionUtil; import com.redhat.rhn.common.util.RpmVersionComparator; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.DistChannelMap; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.org.Org; @@ -61,6 +62,7 @@ import org.hibernate.Session; import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -619,7 +621,13 @@ public class PackageManager extends BaseManager { // metadata needs tto be updated (RHEL5+, mostly) for (Iterator itr = channels.iterator(); itr.hasNext();) { Map m = (Map)itr.next(); - ChannelManager.queueChannelChange(m.get("label").toString(), + String channelLabel = m.get("label").toString(); + Channel channel = ChannelFactory.lookupByLabel(user.getOrg(), channelLabel); + // force channel save to change last_modified + // otherwise the repodata won't be generated + channel.setLastModified(new Date()); + ChannelFactory.save(channel); + ChannelManager.queueChannelChange(channelLabel, "java::deletePackage", pkg.getPackageName().getName()); }
commit fe5971a0f0fc51ce39aa32a0c8285f8e47d9311d Author: Tomas Lestach tlestach@redhat.com Date: Tue Apr 24 14:32:41 2012 +0200
815804 - make the cleanupFileEntries simplier
diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java index a53725e..ef0a531 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/PackageManager.java @@ -85,10 +85,8 @@ public class PackageManager extends BaseManager {
private static final String[] CLEANUP_QUERIES = {"requires", "provides", "conflicts", "obsoletes", - "channels", "files", "caps", "changelogs", "locations"}; + "channels", "files", "caps", "changelogs"};
- - private static final String[] EXCLUDE_SATELLITE = {"locations"}; /** * Runs Package_queries.package_obsoletes query, which returns dependencies of the * obsolete type. @@ -631,11 +629,7 @@ public class PackageManager extends BaseManager { private static void cleanupFileEntries(Long pid) { Map params = new HashMap(); params.put("pid", pid); - List excludeSatellite = Arrays.asList(EXCLUDE_SATELLITE); for (int x = 0; x < CLEANUP_QUERIES.length; x++) { - if (excludeSatellite.indexOf(CLEANUP_QUERIES[x]) > -1) { - continue; - } WriteMode writeMode = ModeFactory.getWriteMode("Package_queries", "cleanup_package_" + CLEANUP_QUERIES[x]); writeMode.executeUpdate(params);
spacewalk-commits@lists.fedorahosted.org