April 2012 - spacewalk-commits - Fedora mailing-lists

schema/spacewalk
by Jan Pazdziora 20 Apr '12

20 Apr '12

schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql | 4 ++-- schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 7f6c38cb972a723c597b11aeceded9e846eb7571 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 20 11:26:09 2012 +0200 Make the records in rhnPackageUpgradeArchCompat -- no need to have duplicates. diff --git a/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql index 1dd9a38..549994c 100644 --- a/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql +++ b/schema/spacewalk/common/tables/rhnPackageUpgradeArchCompat.sql @@ -1,5 +1,5 @@ -- --- Copyright (c) 2010 Red Hat, Inc. +-- Copyright (c) 2010--2012 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 @@ -30,6 +30,6 @@ CREATE TABLE rhnPackageUpgradeArchCompat ENABLE ROW MOVEMENT ; -CREATE INDEX rhn_puac_pa_pua +CREATE UNIQUE INDEX rhn_puac_pa_pua_uq ON rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id) TABLESPACE [[64k_tbs]]; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql new file mode 100644 index 0000000..dd3bf55 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/022-rhnPackageUpgradeArchCompat-unique.sql @@ -0,0 +1,5 @@ + +drop index rhn_puac_pa_pua; +create unique index rhn_puac_pa_pua_uq + on rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id); +

1 0

Changes to 'refs/tags/spacewalk-java-1.8.52-1'
by Jan Pazdziora 20 Apr '12

20 Apr '12

Tag 'spacewalk-java-1.8.52-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-20 05:51 +0000 Tagging package [spacewalk-java] version [1.8.52-1] in directory [java/]. Changes since spacewalk-java-1.8.51-1: Jan Pazdziora (2): Fixing checkstyle. Automatic commit of package [spacewalk-java] release [1.8.52-1]. --- java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 ++-- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 20 Apr '12

20 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 30101534fc6a934f0f61b33450cc8f11134897eb Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 20 07:51:44 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.52-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b7ee7f6..328d913 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.51 +Version: 1.8.52 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Apr 20 2012 Jan Pazdziora 1.8.52-1 +- Fixing checkstyle. + * Thu Apr 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.51-1 - 814365 - When displaying errata available for adding to channel, make sure a clone is not already in the channel. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 5229969..c0917fe 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.51-1 java/ +1.8.52-1 java/

1 0

java/code
by Jan Pazdziora 20 Apr '12

20 Apr '12

java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1f5cb0f606376ae695febde7992c80ca2da0143e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 20 07:51:07 2012 +0200 Fixing checkstyle. Addressing Starting audit... ./code/src/com/redhat/rhn/manager/channel/ChannelManager.java:2445:21: Name 'channel_errata' must match pattern '^[a-z][a-zA-Z0-9]*$'. Audit done. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index b2bfdb0..181c866 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2442,7 +2442,7 @@ public class ChannelManager extends BaseManager { SelectMode m = ModeFactory.getMode("Errata_queries", mode); - Set<Errata> channel_errata = ChannelFactory.lookupById(cid) + Set<Errata> channelErrata = ChannelFactory.lookupById(cid) .getErratas(); DataResult<ErrataOverview> errata = m.execute(params); @@ -2453,7 +2453,7 @@ public class ChannelManager extends BaseManager { Set<ErrataOverview> clones = getClones(erratum); for (ErrataOverview clone : clones) { Errata tmp = ErrataFactory.lookupById(clone.getId()); - if (channel_errata.contains(tmp)) { + if (channelErrata.contains(tmp)) { iterator.remove(); break; // don't bother checking the rest of the clones of // this erratum

1 0

Changes to 'refs/tags/spacewalk-java-1.8.51-1'
by StephenHerr 19 Apr '12

19 Apr '12

Tag 'spacewalk-java-1.8.51-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-19 17:31 +0000 Tagging package [spacewalk-java] version [1.8.51-1] in directory [java/]. Changes since perl-NOCpulse-Probe-1.184.16-1: Stephen Herr (2): 814365 - When displaying errata available for adding to channel, make sure a clone is not already in the channel. Automatic commit of package [spacewalk-java] release [1.8.51-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 34 - java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 244 +++++----- java/spacewalk-java.spec | 6 rel-eng/packages/spacewalk-java | 2 4 files changed, 164 insertions(+), 122 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr 19 Apr '12

19 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 34 - java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 244 +++++----- java/spacewalk-java.spec | 6 rel-eng/packages/spacewalk-java | 2 4 files changed, 164 insertions(+), 122 deletions(-) New commits: commit 1490a54d80636fd8266884d8da3b80afe423b07e Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 19 13:31:05 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.51-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f1b9e16..b7ee7f6 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.50 +Version: 1.8.51 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Apr 19 2012 Stephen Herr <sherr(a)redhat.com> 1.8.51-1 +- 814365 - When displaying errata available for adding to channel, make sure a + clone is not already in the channel. + * Thu Apr 19 2012 Jan Pazdziora 1.8.50-1 - Removed double-dash from WebUI copyright notice. - fix has_errata_with_keyword_applied_since_last_reboot query (mc(a)suse.de) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 7412ceb..5229969 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.50-1 java/ +1.8.51-1 java/ commit c4d9952ab3adfa5e98bd7ef81d932254b8c3ebe5 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 19 13:27:25 2012 -0400 814365 - When displaying errata available for adding to channel, make sure a clone is not already in the channel. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml index e3d892c..5be404f 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml @@ -407,22 +407,17 @@ ORDER BY issue_date DESC <mode name="in_sources_for_target" class="com.redhat.rhn.frontend.dto.ErrataOverview"> - <query params="custom_cid, user_id"> + <query params="user_id"> SELECT DISTINCT E.id , E.advisory_name AS advisory, E.update_date AS UPDATE_DATE, E.synopsis as ADVISORY_SYNOPSIS, E.advisory_type as ADVISORY_TYPE, E.advisory_name AS advisory FROM rhnErrata E inner join - rhnChannelErrata CE on E.id = CE.errata_id left join - ( select Cloned.original_id as clonedId from rhnChannelErrata CE2 inner join - rhnErrataCloned Cloned on CE2.errata_id = cloned.id - where CE2.channel_id = :custom_cid - ) temp on E.id = temp.clonedId, + rhnChannelErrata CE on E.id = CE.errata_id, rhnSet S WHERE CE.channel_id = S.element AND S.label = 'channels_for_errata' - and temp.clonedId is null and S.user_id = :user_id </query> </mode> @@ -442,13 +437,27 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory, </query> </mode> +<mode name="get_cloned_errata" class="com.redhat.rhn.frontend.dto.ErrataOverview"> + <query params="erratum_id"> + select E.id, E.advisory_name as advisory, + E.update_date as UPDATE_DATE, + E.synopsis as ADVISORY_SYNOPSIS, + E.advisory_type as ADVISORY_TYPE, + E.advisory_name AS advisory + from rhnErrataCloned EC, + rhnErrata E + where EC.original_id = :erratum_id + and E.id = EC.id + </query> +</mode> + <mode name="in_sources_for_target_package_assoc" class="com.redhat.rhn.frontend.dto.ErrataOverview"> <query params="custom_cid, user_id"> Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory, Errata1.update_date AS UPDATE_DATE, Errata1.synopsis as ADVISORY_SYNOPSIS, Errata1.advisory_type as ADVISORY_TYPE, - Errata1.advisory_name AS advisory + Errata1.advisory_name AS advisory from ( Select E.* FROM rhnErrata E inner join @@ -465,15 +474,8 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory, ( SELECT CE2.errata_id as Id, CE2.channel_id from rhnChannelErrata CE2 - where CE2.channel_id = :custom_cid ) Errata2 on Errata1.id = Errata2.id left join - - ( select Cloned.original_id as clonedId - from rhnChannelErrata CE2 inner join - rhnErrataCloned Cloned on CE2.errata_id = cloned.id - where CE2.channel_id = :custom_cid - ) temp on temp.clonedId = Errata1.id + where CE2.channel_id = :custom_cid ) Errata2 on Errata1.id = Errata2.id where channel_id is null - and temp.clonedId is null </query> </mode> diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 69f91dd..b2bfdb0 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -42,6 +42,7 @@ import com.redhat.rhn.domain.channel.ReleaseChannelMap; import com.redhat.rhn.domain.common.CommonConstants; import com.redhat.rhn.domain.common.VirtSubscriptionLevel; import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -126,7 +127,7 @@ public class ChannelManager extends BaseManager { * Key used to identify the rhn-tools channel. Used in searches to find the channel */ public static final String TOOLS_CHANNEL_PACKAGE_NAME = - Config.get().getString("tools_channel.package_name", "rhncfg"); + Config.get().getString("tools_channel.package_name", "rhncfg"); /** @@ -134,20 +135,20 @@ public class ChannelManager extends BaseManager { * Used in searches to find the channel */ public static final String VIRT_CHANNEL_PACKAGE_NAME = - Config.get().getString("virt_channel.package_name", "libvirt"); + Config.get().getString("virt_channel.package_name", "libvirt"); /** * Package name of rhn-virtualization-host */ public static final String RHN_VIRT_HOST_PACKAGE_NAME = - Config.get().getString("tools_channel.virt_package_name", - "rhn-virtualization-host"); + Config.get().getString("tools_channel.virt_package_name", + "rhn-virtualization-host"); /** * OS name for the virt child channel. rhnDistChannelMap.OS field. */ public static final String VT_OS_PRODUCT = - Config.get().getString("web.virt_product_os_name", "VT"); + Config.get().getString("web.virt_product_os_name", "VT"); private ChannelManager() { @@ -176,10 +177,10 @@ public class ChannelManager extends BaseManager { */ public static void refreshWithNewestPackages(Long channelId, String label) { Channel chan = ChannelFactory.lookupById(channelId); - ChannelFactory.refreshNewestPackageCache(channelId, label); - if (chan != null) { - ChannelManager.queueChannelChange(chan.getLabel(), label, label); - } + ChannelFactory.refreshNewestPackageCache(channelId, label); + if (chan != null) { + ChannelManager.queueChannelChange(chan.getLabel(), label, label); + } } /** @@ -193,7 +194,7 @@ public class ChannelManager extends BaseManager { * @param label label for taskomatic repo_regen request */ public static void cloneNewestPackages(Long fromChannelId, Channel toChannel, - String label) { + String label) { ChannelFactory.cloneNewestPackageCache(fromChannelId, toChannel.getId()); ChannelManager.queueChannelChange( toChannel.getLabel(), label, "clone channel"); @@ -258,7 +259,7 @@ public class ChannelManager extends BaseManager { ocf.setCurrentFlex(orgo.getCurrentFlex()); } if (ocf.getSatelliteMaxMembers() != null) { - ret.add(ocf); + ret.add(ocf); } } return ret; @@ -302,9 +303,9 @@ public class ChannelManager extends BaseManager { * family.</strong> */ public static List<OrgSoftwareEntitlementDto> - listEntitlementsForAllOrgs(ChannelFamily cf, User user) { + listEntitlementsForAllOrgs(ChannelFamily cf, User user) { List <OrgSoftwareEntitlementDto> ret = - new LinkedList<OrgSoftwareEntitlementDto>(); + new LinkedList<OrgSoftwareEntitlementDto>(); List<ChannelOverview> entitlementUsage = ChannelManager.getEntitlementForAllOrgs( cf.getId()); @@ -312,18 +313,18 @@ public class ChannelManager extends BaseManager { // Create a mapping of org ID's to the channel overview returned, we'll need this // when iterating the list of all orgs shortly: Map<Long, ChannelOverview> orgEntitlementUsage = new - HashMap<Long, ChannelOverview>(); + HashMap<Long, ChannelOverview>(); for (ChannelOverview o : entitlementUsage) { orgEntitlementUsage.put(o.getOrgId(), o); } Org satelliteOrg = OrgFactory.getSatelliteOrg(); ChannelOverview satelliteOrgOverview = ChannelManager.getEntitlement( - satelliteOrg.getId(), - cf.getId()); + satelliteOrg.getId(), + cf.getId()); if (satelliteOrgOverview == null) { throw new RuntimeException("Satellite org does not" + - "appear to have been allocated entitlement:" + - cf.getId()); + "appear to have been allocated entitlement:" + + cf.getId()); } List<Org> allOrgs = OrgManager.allOrgs(user); @@ -342,9 +343,9 @@ public class ChannelManager extends BaseManager { private static OrgSoftwareEntitlementDto makeOrgSoftwareEntitlement( - ChannelOverview co, - Org org, - ChannelOverview satelliteOrgOverview) { + ChannelOverview co, + Org org, + ChannelOverview satelliteOrgOverview) { OrgSoftwareEntitlementDto seDto = new OrgSoftwareEntitlementDto(); seDto.setOrg(org); seDto.setCurrentMembers(co.getCurrentMembers()); @@ -352,7 +353,7 @@ public class ChannelManager extends BaseManager { if (co.getMaxMembers() != null && satelliteOrgOverview.getFreeMembers() != null) { seDto.setMaxPossibleAllocation(co.getMaxMembers() + - satelliteOrgOverview.getFreeMembers()); + satelliteOrgOverview.getFreeMembers()); } seDto.setCurrentFlex(co.getCurrentFlex()); @@ -361,7 +362,7 @@ public class ChannelManager extends BaseManager { if (co.getMaxFlex() != null && satelliteOrgOverview.getFreeFlex() != null) { seDto.setMaxPossibleFlexAllocation(co.getMaxFlex() + - satelliteOrgOverview.getFreeFlex()); + satelliteOrgOverview.getFreeFlex()); } return seDto; } @@ -377,9 +378,9 @@ public class ChannelManager extends BaseManager { * all orgs. */ public static List<OrgSoftwareEntitlementDto> - listEntitlementsForAllOrgsWithEmptyOrgs(ChannelFamily cf, User user) { + listEntitlementsForAllOrgsWithEmptyOrgs(ChannelFamily cf, User user) { List <OrgSoftwareEntitlementDto> ret = - new LinkedList<OrgSoftwareEntitlementDto>(); + new LinkedList<OrgSoftwareEntitlementDto>(); List<ChannelOverview> entitlementUsage = ChannelManager.getEntitlementForAllOrgs( cf.getId()); @@ -387,18 +388,18 @@ public class ChannelManager extends BaseManager { // Create a mapping of org ID's to the channel overview returned, we'll need this // when iterating the list of all orgs shortly: Map<Long, ChannelOverview> orgEntitlementUsage = - new HashMap<Long, ChannelOverview>(); + new HashMap<Long, ChannelOverview>(); for (ChannelOverview o : entitlementUsage) { orgEntitlementUsage.put(o.getOrgId(), o); } Org satelliteOrg = OrgFactory.getSatelliteOrg(); ChannelOverview satelliteOrgOverview = ChannelManager.getEntitlement( - satelliteOrg.getId(), - cf.getId()); + satelliteOrg.getId(), + cf.getId()); if (satelliteOrgOverview == null) { throw new RuntimeException("Satellite org does not" + - "appear to have been allocated entitlement:" + - cf.getId()); + "appear to have been allocated entitlement:" + + cf.getId()); } List<Org> allOrgs = OrgManager.allOrgs(user); @@ -451,7 +452,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult vendorChannelTree(User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "vendor_channel_tree"); @@ -475,7 +476,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult popularChannelTree(User user, Long serverCount, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "popular_channel_tree"); Map params = new HashMap(); @@ -497,7 +498,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult myChannelTree(User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "my_channel_tree"); @@ -520,7 +521,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult trustChannelConsume(Org org, Org trustOrg, User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "trust_channel_consume"); Map params = new HashMap(); @@ -539,7 +540,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult allChannelTree(User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "all_channel_tree"); Map params = new HashMap(); @@ -574,7 +575,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult sharedChannelTree(User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "shared_channel_tree"); Map params = new HashMap(); @@ -593,7 +594,7 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's */ public static DataResult retiredChannelTree(User user, - ListControl lc) { + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "retired_channel_tree"); Map params = new HashMap(); @@ -613,8 +614,8 @@ public class ChannelManager extends BaseManager { * @return list of ChannelTreeNode's representing the channel family */ public static DataResult channelFamilyTree(User user, - Long familyId, - ListControl lc) { + Long familyId, + ListControl lc) { SelectMode m = ModeFactory.getMode("Channel_queries", "channel_family_tree"); Map params = new HashMap(); @@ -655,7 +656,7 @@ public class ChannelManager extends BaseManager { */ public static DataResult channelsOwnedByOrg(Long orgId, PageControl pc) { SelectMode m = ModeFactory.getMode("Channel_queries", - "channels_owned_by_org"); + "channels_owned_by_org"); Map params = new HashMap(); params.put("org_id", orgId); return makeDataResult(params, null, pc, m); @@ -672,11 +673,11 @@ public class ChannelManager extends BaseManager { if (e.isPublished()) { m = ModeFactory.getMode("Channel_queries", - "relevant_packages_for_channel_published"); + "relevant_packages_for_channel_published"); } else { m = ModeFactory.getMode("Channel_queries", - "relevant_packages_for_channel_unpublished"); + "relevant_packages_for_channel_unpublished"); } Map params = new HashMap(); @@ -742,7 +743,7 @@ public class ChannelManager extends BaseManager { //Setup items for the query SelectMode m = ModeFactory.getMode("Channel_queries", - "user_subscribe_perms"); + "user_subscribe_perms"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -805,13 +806,13 @@ public class ChannelManager extends BaseManager { public static Channel getProxyChannelByVersion(String version, Server server) { ChannelFamily proxyFamily = ChannelFamilyFactory - .lookupByLabel(ChannelFamilyFactory - .PROXY_CHANNEL_FAMILY_LABEL, - null); + .lookupByLabel(ChannelFamilyFactory + .PROXY_CHANNEL_FAMILY_LABEL, + null); if (proxyFamily == null || - proxyFamily.getChannels() == null || - proxyFamily.getChannels().isEmpty()) { + proxyFamily.getChannels() == null || + proxyFamily.getChannels().isEmpty()) { if (!ConfigDefaults.get().isSpacewalk()) { throw new ProxyChannelNotFoundException(); } @@ -824,8 +825,8 @@ public class ChannelManager extends BaseManager { */ for (Channel proxyChan : proxyFamily.getChannels()) { if (proxyChan.getProduct() != null && - proxyChan.getProduct().getVersion().equals(version) && - proxyChan.getParentChannel().equals(server.getBaseChannel())) { + proxyChan.getProduct().getVersion().equals(version) && + proxyChan.getParentChannel().equals(server.getBaseChannel())) { return proxyChan; } } @@ -845,7 +846,7 @@ public class ChannelManager extends BaseManager { */ public static List<DataResult> allChannelsTree(User user) { SelectMode m = ModeFactory.getMode("Channel_queries", - "all_channels_tree"); + "all_channels_tree"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -871,7 +872,7 @@ public class ChannelManager extends BaseManager { * given label */ public static void deleteChannel(User user, String label) - throws InvalidChannelRoleException, NoSuchChannelException { + throws InvalidChannelRoleException, NoSuchChannelException { Channel toRemove = ChannelFactory.lookupByLabel(user.getOrg(), label); @@ -929,7 +930,7 @@ public class ChannelManager extends BaseManager { * @throws InvalidChannelRoleException if the user does not have perms */ public static boolean verifyChannelAdmin(User user, Long cid) - throws InvalidChannelRoleException { + throws InvalidChannelRoleException { if (user.hasRole(RoleFactory.RHN_SUPERUSER) || user.hasRole(RoleFactory.CHANNEL_ADMIN)) { @@ -950,7 +951,7 @@ public class ChannelManager extends BaseManager { } //Insert row into rhnChannelPermission WriteMode m = ModeFactory.getWriteMode("Channel_queries", - "grant_channel_permission"); + "grant_channel_permission"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("cid", channel.getId()); @@ -969,7 +970,7 @@ public class ChannelManager extends BaseManager { } //Delete row from rhnChannelPermission WriteMode m = ModeFactory.getWriteMode("Channel_queries", - "revoke_channel_permission"); + "revoke_channel_permission"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("cid", channel.getId()); @@ -988,7 +989,7 @@ public class ChannelManager extends BaseManager { } //Insert row into rhnChannelPermission WriteMode m = ModeFactory.getWriteMode("Channel_queries", - "grant_channel_permission"); + "grant_channel_permission"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("cid", channel.getId()); @@ -1007,7 +1008,7 @@ public class ChannelManager extends BaseManager { } //Delete row from rhnChannelPermission WriteMode m = ModeFactory.getWriteMode("Channel_queries", - "revoke_channel_permission"); + "revoke_channel_permission"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("cid", channel.getId()); @@ -1149,7 +1150,7 @@ public class ChannelManager extends BaseManager { } private static boolean verifyChannelRole(User user, Long cid, String role) - throws InvalidChannelRoleException { + throws InvalidChannelRoleException { CallableMode m = ModeFactory.getCallableMode( "Channel_queries", "verify_channel_role"); @@ -1203,8 +1204,8 @@ public class ChannelManager extends BaseManager { */ public static Long getAvailableEntitlements(Org org, Channel c) { ChannelEntitlementCounter counter = - (ChannelEntitlementCounter) MethodUtil.getClassFromConfig( - ChannelEntitlementCounter.class.getName()); + (ChannelEntitlementCounter) MethodUtil.getClassFromConfig( + ChannelEntitlementCounter.class.getName()); Long retval = counter.getAvailableEntitlements(org, c); log.debug("getAvailableEntitlements: " + c.getLabel() + " got: " + retval); @@ -1220,8 +1221,8 @@ public class ChannelManager extends BaseManager { */ public static Long getAvailableFveEntitlements(Org org, Channel c) { ChannelEntitlementCounter counter = - (ChannelEntitlementCounter) MethodUtil.getClassFromConfig( - ChannelEntitlementCounter.class.getName()); + (ChannelEntitlementCounter) MethodUtil.getClassFromConfig( + ChannelEntitlementCounter.class.getName()); Long retval = counter.getAvailableFveEntitlements(org, c); log.debug("getAvailableFveEntitlements: " + c.getLabel() + " got: " + retval); @@ -1272,7 +1273,7 @@ public class ChannelManager extends BaseManager { * @return the errata applicable to a channel */ public static DataResult<ErrataOverview> listErrata(Channel channel, Date start, - Date end, User user) { + Date end, User user) { String mode = "in_channel"; Map params = new HashMap(); params.put("cid", channel.getId()); @@ -1423,7 +1424,7 @@ public class ChannelManager extends BaseManager { * @return list of packages in channel */ public static List listAllPackagesByDate(Channel channel, String startDate, - String endDate) { + String endDate) { String mode = "all_packages_in_channel_by_date"; Map params = new HashMap(); @@ -1454,7 +1455,7 @@ public class ChannelManager extends BaseManager { */ public static Long getLatestPackageEqual(Long channelId, String packageName) { SelectMode m = ModeFactory.getMode("Channel_queries", - "latest_package_equal"); + "latest_package_equal"); Map params = new HashMap(); params.put("cid", channelId); params.put("name", packageName); @@ -1502,7 +1503,7 @@ public class ChannelManager extends BaseManager { channelId + " pn: " + packageName); } SelectMode m = ModeFactory.getMode("Channel_queries", - "latest_package_equal"); + "latest_package_equal"); Map params = new HashMap(); params.put("cid", channelId); params.put("name", packageName); @@ -1523,7 +1524,7 @@ public class ChannelManager extends BaseManager { channelId + " packageName : " + packageName); } SelectMode m = ModeFactory.getMode("Channel_queries", - "latest_package_like"); + "latest_package_like"); StringBuffer pname = new StringBuffer(); pname.append("%"); pname.append(packageName); @@ -1596,7 +1597,7 @@ public class ChannelManager extends BaseManager { */ public static List<Long> findChildChannelsWithPackage(String packageName, Org org) { SelectMode m = ModeFactory.getMode("Channel_queries", - "child_channels_with_package"); + "child_channels_with_package"); Map params = new HashMap(); params.put("package", packageName); params.put("org_id", org.getId()); @@ -1619,7 +1620,7 @@ public class ChannelManager extends BaseManager { * @return Channel we subscribed to, null if not. */ public static Channel subscribeToChildChannelWithPackageName(User user, Server current, - String packageName) { + String packageName) { log.debug("subscribeToChildChannelWithPackageName: " + current.getId() + " name: " + packageName); @@ -1706,7 +1707,7 @@ public class ChannelManager extends BaseManager { * @return Channel we subscribed to, null if not. */ public static Channel subscribeToChildChannelByOSProduct(User user, Server current, - String osProductName) { + String osProductName) { /* * First make sure that we have a base channel. @@ -1748,14 +1749,14 @@ public class ChannelManager extends BaseManager { } if (foundChannel != null) { - log.debug("we found a channel, now lets see if we should sub"); - if (!current.isSubscribed(foundChannel)) { + log.debug("we found a channel, now lets see if we should sub"); + if (!current.isSubscribed(foundChannel)) { if (log.isDebugEnabled()) { log.debug("subChildChannelByOSProduct " + "Subscribing server to channel: " + foundChannel); } SystemManager.subscribeServerToChannel(user, current, foundChannel); - } + } } log.debug("subscribeToChildChannelByOSProduct returning: " + foundChannel); return foundChannel; @@ -1857,8 +1858,8 @@ public class ChannelManager extends BaseManager { } // First search for legacy kickstart package names: List kspackages = ChannelManager. - listLatestPackagesLike(child.getId(), - KickstartData.LEGACY_KICKSTART_PACKAGE_NAME); + listLatestPackagesLike(child.getId(), + KickstartData.LEGACY_KICKSTART_PACKAGE_NAME); if (kspackages.size() > 0) { return child; } @@ -1942,7 +1943,7 @@ public class ChannelManager extends BaseManager { } Channel defaultBaseChan = getDefaultBaseChannel(version, - baseChan.getChannelArch()); + baseChan.getChannelArch()); if (defaultBaseChan == null) { return false; } @@ -2008,7 +2009,7 @@ public class ChannelManager extends BaseManager { log.debug("System does not have default base channel."); log.debug("Looking up all available EUS channels."); baseEusChans = listBaseEusChannelsByVersionReleaseAndServerArch(usr, - rhelVersion, rhelRelease, serverArch); + rhelVersion, rhelRelease, serverArch); } channelDtos.addAll(baseEusChans); @@ -2085,9 +2086,9 @@ public class ChannelManager extends BaseManager { } if (c != null && - (c.getOrg() != null || - inChan.getChannelArch().equals(c.getChannelArch())) && - !retval.contains(ecd)) { + (c.getOrg() != null || + inChan.getChannelArch().equals(c.getChannelArch())) && + !retval.contains(ecd)) { retval.add(ecd); } } @@ -2162,7 +2163,7 @@ public class ChannelManager extends BaseManager { } } - return retval; + return retval; } private static EssentialChannelDto channelToEssentialChannelDto(Channel channel, @@ -2217,7 +2218,7 @@ public class ChannelManager extends BaseManager { * @return List of EssentialChannelDto's. */ public static List<EssentialChannelDto> - listBaseEusChannelsByVersionReleaseAndServerArch(User user, + listBaseEusChannelsByVersionReleaseAndServerArch(User user, String version, String release, String serverArch) { log.debug("listBaseEusChannelsByVersionReleaseAndServerArch()"); @@ -2225,7 +2226,7 @@ public class ChannelManager extends BaseManager { log.debug(" release = " + release); log.debug(" serverArch = " + serverArch); SelectMode m = ModeFactory.getMode("Channel_queries", - "base_eus_channels_by_version_release_server_arch"); + "base_eus_channels_by_version_release_server_arch"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2262,12 +2263,12 @@ public class ChannelManager extends BaseManager { * @return List of EssentialChannelDto's. */ public static List<EssentialChannelDto> - listBaseEusChannelsByVersionReleaseAndChannelArch(User user, + listBaseEusChannelsByVersionReleaseAndChannelArch(User user, String version, String release, Long channelArchId) { log.debug("listBaseEusChannelsByVersionReleaseAndChannelArch()"); SelectMode m = ModeFactory.getMode("Channel_queries", - "base_eus_channels_by_version_channel_arch"); + "base_eus_channels_by_version_channel_arch"); Map params = new HashMap(); params.put("user_id", user.getId()); params.put("org_id", user.getOrg().getId()); @@ -2306,7 +2307,7 @@ public class ChannelManager extends BaseManager { log.debug("listBaseEusChannelsByVersionAndChannelArch"); SelectMode m = ModeFactory.getMode("Channel_queries", - "base_eus_channels_by_version_channel_arch"); + "base_eus_channels_by_version_channel_arch"); Map params = new HashMap(); params.put("user_id", user.getId()); @@ -2332,7 +2333,7 @@ public class ChannelManager extends BaseManager { */ public static DataResult listBaseChannelsForOrg(Org o) { SelectMode m = - ModeFactory.getMode("Channel_queries", "base_channels_for_org"); + ModeFactory.getMode("Channel_queries", "base_channels_for_org"); Map params = new HashMap(); params.put("org_id", o.getId()); DataResult dr = makeDataResult(params, new HashMap(), null, m); @@ -2369,7 +2370,7 @@ public class ChannelManager extends BaseManager { } Map <ProductName, Channel> prodChannels = - new HashMap<ProductName, Channel>(); + new HashMap<ProductName, Channel>(); for (Channel channel : newBaseChannel.getAccessibleChildrenFor(user)) { if (channel.getProductName() != null) { @@ -2398,10 +2399,10 @@ public class ChannelManager extends BaseManager { Channel targetChannel, boolean packageAssoc) { String mode; if (packageAssoc) { - mode = "for_target_package_assoc"; + mode = "for_target_package_assoc"; } else { - mode = "for_target"; + mode = "for_target"; } Map params = new HashMap(); @@ -2413,7 +2414,6 @@ public class ChannelManager extends BaseManager { return m.execute(params); } - /** * Finds errata associated with channels in the "channels_for_errata" rhnSet that * apply to a custom channel @@ -2427,22 +2427,58 @@ public class ChannelManager extends BaseManager { Channel targetChannel, boolean packageAssoc, User user) { String mode; + Org org = user.getOrg(); + Map params = new HashMap(); + Long cid = targetChannel.getId(); if (packageAssoc) { - mode = "in_sources_for_target_package_assoc"; + mode = "in_sources_for_target_package_assoc"; + params.put("custom_cid", cid); } else { - mode = "in_sources_for_target"; + mode = "in_sources_for_target"; } - Map params = new HashMap(); - params.put("custom_cid", targetChannel.getId()); params.put("user_id", user.getId()); + SelectMode m = ModeFactory.getMode("Errata_queries", mode); - SelectMode m = ModeFactory.getMode( - "Errata_queries", mode); + Set<Errata> channel_errata = ChannelFactory.lookupById(cid) + .getErratas(); - return m.execute(params); + DataResult<ErrataOverview> errata = m.execute(params); + + Iterator<ErrataOverview> iterator = errata.iterator(); + while (iterator.hasNext()) { + ErrataOverview erratum = iterator.next(); + Set<ErrataOverview> clones = getClones(erratum); + for (ErrataOverview clone : clones) { + Errata tmp = ErrataFactory.lookupById(clone.getId()); + if (channel_errata.contains(tmp)) { + iterator.remove(); + break; // don't bother checking the rest of the clones of + // this erratum + } + } + } + + return errata; + } + + /* + * recursive method to find all the clones of an erratum + */ + private static Set<ErrataOverview> getClones(ErrataOverview erratum) { + Set<ErrataOverview> errata = new HashSet<ErrataOverview>(); + Map params = new HashMap(); + params.put("erratum_id", erratum.getId()); + errata.addAll(ModeFactory + .getMode("Errata_queries", "get_cloned_errata").execute(params)); + Set<ErrataOverview> tmp = new HashSet<ErrataOverview>(); + for (ErrataOverview clone : errata) { + tmp.addAll(getClones(clone)); + } + errata.addAll(tmp); + return errata; } /** @@ -2458,10 +2494,10 @@ public class ChannelManager extends BaseManager { Channel targetChannel, boolean packageAssoc) { String mode; if (packageAssoc) { - mode = "custom_for_target_package_assoc"; + mode = "custom_for_target_package_assoc"; } else { - mode = "custom_for_target"; + mode = "custom_for_target"; } Map params = new HashMap(); @@ -2681,7 +2717,7 @@ public class ChannelManager extends BaseManager { ClonedChannel cc = (ClonedChannel) c; params.put("ocid", cc.getOriginal().getId()); SelectMode m = ModeFactory.getMode("Errata_queries", - "list_errata_needing_sync"); + "list_errata_needing_sync"); return m.execute(params); } return Collections.EMPTY_LIST; @@ -2732,7 +2768,7 @@ public class ChannelManager extends BaseManager { */ public static String getRepoLastBuild(Channel channel) { String pathPrefix = Config.get().getString(ConfigDefaults.REPOMD_PATH_PREFIX, - "rhn/repodata"); + "rhn/repodata"); String mountPoint = Config.get().getString(ConfigDefaults.REPOMD_CACHE_MOUNT_POINT, "/pub"); File theFile = new File(mountPoint + File.separator + pathPrefix + @@ -2818,8 +2854,8 @@ public class ChannelManager extends BaseManager { } if (!unsubChans.isEmpty()) { m = ModeFactory.getMode("Channel_queries", - "ssm_systems_for_child_unsubscription"); - unsubDr = m.execute(params, unsubCids); + "ssm_systems_for_child_unsubscription"); + unsubDr = m.execute(params, unsubCids); }

1 0

Changes to 'refs/tags/spacewalk-web-1.8.11-1'
by Jan Pazdziora 19 Apr '12

19 Apr '12

Tag 'spacewalk-web-1.8.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000 Tagging package [spacewalk-web] version [1.8.11-1] in directory [web/]. Changes since spacewalk-proxy-1.8.3-1: Duncan Mac-Vicar P (1): Show systems that need reboot because of an errata. Jan Pazdziora (5): Removed double-dash from WebUI copyright notice. Update the copyright year info on .pxt pages. Removed double-dash from copyright notice on error pages. Removed double-dash from copyright notice on error pages, fixing typo. Automatic commit of package [spacewalk-web] release [1.8.11-1]. Michael Calmer (1): fix has_errata_with_keyword_applied_since_last_reboot query Miroslav Suchý (1): 808118 - ignore fuse.gvfs-fuse-daemon in df Tomas Lestach (3): 803353 - fixing another two broken documentation links increase taskomatic memory fix PackageEvr handling III --- branding/templates/footer.pxt | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++ java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 + java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++---- java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 - java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 java/code/webapp/WEB-INF/struts-config.xml | 10 + java/conf/default/rhn_taskomatic_daemon.conf | 2 monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 rel-eng/packages/spacewalk-web | 2 web/html/errors/403.html | 2 web/html/errors/404.html | 2 web/html/errors/413.html | 2 web/html/errors/500.html | 2 web/spacewalk-web.spec | 5 42 files changed, 283 insertions(+), 71 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-java-1.8.50-1'
by Jan Pazdziora 19 Apr '12

19 Apr '12

Tag 'spacewalk-java-1.8.50-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000 Tagging package [spacewalk-java] version [1.8.50-1] in directory [java/]. Changes since spacewalk-proxy-1.8.3-1: Duncan Mac-Vicar P (1): Show systems that need reboot because of an errata. Jan Pazdziora (6): Removed double-dash from WebUI copyright notice. Update the copyright year info on .pxt pages. Removed double-dash from copyright notice on error pages. Removed double-dash from copyright notice on error pages, fixing typo. Automatic commit of package [spacewalk-web] release [1.8.11-1]. Automatic commit of package [spacewalk-java] release [1.8.50-1]. Michael Calmer (1): fix has_errata_with_keyword_applied_since_last_reboot query Miroslav Suchý (1): 808118 - ignore fuse.gvfs-fuse-daemon in df Tomas Lestach (3): 803353 - fixing another two broken documentation links increase taskomatic memory fix PackageEvr handling III --- branding/templates/footer.pxt | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++ java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 + java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++---- java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 - java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 java/code/webapp/WEB-INF/struts-config.xml | 10 + java/conf/default/rhn_taskomatic_daemon.conf | 2 java/spacewalk-java.spec | 11 +- monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-web | 2 web/html/errors/403.html | 2 web/html/errors/404.html | 2 web/html/errors/413.html | 2 web/html/errors/500.html | 2 web/spacewalk-web.spec | 5 44 files changed, 294 insertions(+), 73 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-branding-1.8.1-1'
by Jan Pazdziora 19 Apr '12

19 Apr '12

Tag 'spacewalk-branding-1.8.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:15 +0000 Tagging package [spacewalk-branding] version [1.8.1-1] in directory [branding/]. Changes since spacewalk-proxy-1.8.3-1: Duncan Mac-Vicar P (1): Show systems that need reboot because of an errata. Jan Pazdziora (7): Removed double-dash from WebUI copyright notice. Update the copyright year info on .pxt pages. Removed double-dash from copyright notice on error pages. Removed double-dash from copyright notice on error pages, fixing typo. Automatic commit of package [spacewalk-web] release [1.8.11-1]. Automatic commit of package [spacewalk-java] release [1.8.50-1]. Automatic commit of package [spacewalk-branding] release [1.8.1-1]. Michael Calmer (1): fix has_errata_with_keyword_applied_since_last_reboot query Miroslav Suchý (1): 808118 - ignore fuse.gvfs-fuse-daemon in df Tomas Lestach (3): 803353 - fixing another two broken documentation links increase taskomatic memory fix PackageEvr handling III --- branding/spacewalk-branding.spec | 5 branding/templates/footer.pxt | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++ java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 + java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++---- java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 - java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 java/code/webapp/WEB-INF/struts-config.xml | 10 + java/conf/default/rhn_taskomatic_daemon.conf | 2 java/spacewalk-java.spec | 11 +- monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-web | 2 web/html/errors/403.html | 2 web/html/errors/404.html | 2 web/html/errors/413.html | 2 web/html/errors/500.html | 2 web/spacewalk-web.spec | 5 46 files changed, 299 insertions(+), 75 deletions(-) ---

1 0

Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.16-1'
by Jan Pazdziora 19 Apr '12

19 Apr '12

Tag 'perl-NOCpulse-Probe-1.184.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-19 15:16 +0000 Tagging package [perl-NOCpulse-Probe] version [1.184.16-1] in directory [monitoring/PerlModules/NP/Probe/]. Changes since spacewalk-proxy-1.8.3-1: Duncan Mac-Vicar P (1): Show systems that need reboot because of an errata. Jan Pazdziora (8): Removed double-dash from WebUI copyright notice. Update the copyright year info on .pxt pages. Removed double-dash from copyright notice on error pages. Removed double-dash from copyright notice on error pages, fixing typo. Automatic commit of package [spacewalk-web] release [1.8.11-1]. Automatic commit of package [spacewalk-java] release [1.8.50-1]. Automatic commit of package [spacewalk-branding] release [1.8.1-1]. Automatic commit of package [perl-NOCpulse-Probe] release [1.184.16-1]. Michael Calmer (1): fix has_errata_with_keyword_applied_since_last_reboot query Miroslav Suchý (1): 808118 - ignore fuse.gvfs-fuse-daemon in df Tomas Lestach (3): 803353 - fixing another two broken documentation links increase taskomatic memory fix PackageEvr handling III --- branding/spacewalk-branding.spec | 5 branding/templates/footer.pxt | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 53 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++ java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 16 ++- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 + java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++ java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 ++++---- java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 - java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 - java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 java/code/webapp/WEB-INF/struts-config.xml | 10 + java/conf/default/rhn_taskomatic_daemon.conf | 2 java/spacewalk-java.spec | 11 +- monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 rel-eng/packages/perl-NOCpulse-Probe | 2 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-web | 2 web/html/errors/403.html | 2 web/html/errors/404.html | 2 web/html/errors/413.html | 2 web/html/errors/500.html | 2 web/spacewalk-web.spec | 5 48 files changed, 304 insertions(+), 77 deletions(-) ---

1 0

4 commits - branding/spacewalk-branding.spec java/spacewalk-java.spec monitoring/PerlModules rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora 19 Apr '12

19 Apr '12

branding/spacewalk-branding.spec | 5 ++++- java/spacewalk-java.spec | 11 ++++++++++- monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 5 ++++- rel-eng/packages/perl-NOCpulse-Probe | 2 +- rel-eng/packages/spacewalk-branding | 2 +- rel-eng/packages/spacewalk-java | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 8 files changed, 26 insertions(+), 8 deletions(-) New commits: commit 056ddeefe82a15b8b55b417f5ab2ca42d0d6ff05 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 17:16:04 2012 +0200 Automatic commit of package [perl-NOCpulse-Probe] release [1.184.16-1]. diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec index f546309..dbe8190 100644 --- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec +++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec @@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe Summary: Monitoring probes for Spacewalk URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.184.15 +Version: 1.184.16 Release: 1%{?dist} BuildArch: noarch Group: Development/Libraries @@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/NOCpulse/Probe/DataSource/test/TestOracle.pm %changelog +* Thu Apr 19 2012 Jan Pazdziora 1.184.16-1 +- 808118 - ignore fuse.gvfs-fuse-daemon in df (msuchy(a)redhat.com) + * Fri Mar 02 2012 Jan Pazdziora 1.184.15-1 - Update the copyright year info. diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe index d970446..8dd013a 100644 --- a/rel-eng/packages/perl-NOCpulse-Probe +++ b/rel-eng/packages/perl-NOCpulse-Probe @@ -1 +1 @@ -1.184.15-1 monitoring/PerlModules/NP/Probe/ +1.184.16-1 monitoring/PerlModules/NP/Probe/ commit 2a2c84f015df911106015f64a163fb698c303aff Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 17:15:40 2012 +0200 Automatic commit of package [spacewalk-branding] release [1.8.1-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index b255f4d..f76ae47 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: Spacewalk branding data @@ -83,6 +83,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Thu Apr 19 2012 Jan Pazdziora 1.8.1-1 +- Update the copyright year info on .pxt pages. + * Mon Feb 27 2012 Jan Pazdziora 1.7.1-1 - automatically focus search form (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index c86e38b..c922cb5 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -1.7.1-1 branding/ +1.8.1-1 branding/ commit 1297c763e9d19c8b1114b28423037a26df8344f8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 17:15:27 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.50-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f2d3aa6..f1b9e16 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.49 +Version: 1.8.50 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,15 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Apr 19 2012 Jan Pazdziora 1.8.50-1 +- Removed double-dash from WebUI copyright notice. +- fix has_errata_with_keyword_applied_since_last_reboot query (mc(a)suse.de) +- fix PackageEvr handling III (tlestach(a)redhat.com) +- increase taskomatic memory (tlestach(a)redhat.com) +- 803353 - fixing another two broken documentation links (tlestach(a)redhat.com) +- Show systems that need reboot because of an errata. (dmacvicar(a)suse.de) +- modify SecurityErrataOverview.callaback (tlestach(a)redhat.com) + * Tue Apr 17 2012 Jan Pazdziora 1.8.49-1 - Revert "removing unused string with trans-id Certificate Administrators, Monitoring Administrators, and Configuration Administrators" diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 9ebc91b..7412ceb 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.49-1 java/ +1.8.50-1 java/ commit 0c0edf5fdf23b7f87f20a7e6a16215a919d10aae Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 17:15:19 2012 +0200 Automatic commit of package [spacewalk-web] release [1.8.11-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 689297e..4d20a7f 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.10-1 web/ +1.8.11-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 68a0ea5..685d78a 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.10 +Version: 1.8.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Thu Apr 19 2012 Jan Pazdziora 1.8.11-1 +- Removed double-dash from copyright notice on error pages. + * Tue Apr 17 2012 Jan Pazdziora 1.8.10-1 - Broken link patch submitted on behalf of Michael Calmer (sherr(a)redhat.com)

1 0

monitoring/PerlModules
by Miroslav Suchý 19 Apr '12

19 Apr '12

monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5927ed33b158e95d3fc98f9d2884c62e50da2935 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Apr 19 16:35:37 2012 +0200 808118 - ignore fuse.gvfs-fuse-daemon in df it is owned by different user and nocpulse user do not have access to this addressing: df: `/root/.gvfs': Permission denied diff --git a/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm b/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm index 231d584..135bd78 100644 --- a/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm +++ b/monitoring/PerlModules/NP/Probe/DataSource/UnixCommand.pm @@ -144,7 +144,7 @@ sub cpu { # has a for_filesystem hash indexed by filesystem name. sub df { my $self = shift; - my $args = '-k'; + my $args = '-k --exclude-type=fuse.gvfs-fuse-daemon'; if (os_matches($self->shell_os_name, PROBE_HPUX)){ $args = '-Pk'; @@ -192,7 +192,7 @@ sub inodes { LINUX() => { binary => '/bin/df', - args => "-i $fs", + args => "--exclude-type=fuse.gvfs-fuse-daemon -i $fs", parse => sub { my (@fields) = @_;

1 0

web/html
by Jan Pazdziora 19 Apr '12

19 Apr '12

web/html/errors/403.html | 2 +- web/html/errors/404.html | 2 +- web/html/errors/413.html | 2 +- web/html/errors/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 70e8be368146664fdb73aaf528e6922cfd12d4d0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 13:55:33 2012 +0200 Removed double-dash from copyright notice on error pages, fixing typo. diff --git a/web/html/errors/403.html b/web/html/errors/403.html index 7fd8b29..f0c0a2f 100644 --- a/web/html/errors/403.html +++ b/web/html/errors/403.html @@ -127,7 +127,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/404.html b/web/html/errors/404.html index becf70e..8bde7ed 100644 --- a/web/html/errors/404.html +++ b/web/html/errors/404.html @@ -114,7 +114,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/413.html b/web/html/errors/413.html index 2490bc4..49f4669 100644 --- a/web/html/errors/413.html +++ b/web/html/errors/413.html @@ -122,7 +122,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/500.html b/web/html/errors/500.html index 44020f9..4c2ba64 100644 --- a/web/html/errors/500.html +++ b/web/html/errors/500.html @@ -120,7 +120,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>

1 0

web/html
by Jan Pazdziora 19 Apr '12

19 Apr '12

web/html/errors/403.html | 2 +- web/html/errors/404.html | 2 +- web/html/errors/413.html | 2 +- web/html/errors/500.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit b5c5953c038922c6214618e85c6558b29b26729b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 13:29:30 2012 +0200 Removed double-dash from copyright notice on error pages. diff --git a/web/html/errors/403.html b/web/html/errors/403.html index a867e25..7fd8b29 100644 --- a/web/html/errors/403.html +++ b/web/html/errors/403.html @@ -127,7 +127,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/404.html b/web/html/errors/404.html index f559250..becf70e 100644 --- a/web/html/errors/404.html +++ b/web/html/errors/404.html @@ -114,7 +114,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/413.html b/web/html/errors/413.html index d0f9f7d..2490bc4 100644 --- a/web/html/errors/413.html +++ b/web/html/errors/413.html @@ -122,7 +122,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>  diff --git a/web/html/errors/500.html b/web/html/errors/500.html index 82451de..44020f9 100644 --- a/web/html/errors/500.html +++ b/web/html/errors/500.html @@ -120,7 +120,7 @@ </tbody></table> <div id="footer"> - Copyright © 2002--2012 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002#x2012;12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div> </div>

1 0

2 commits - branding/templates java/code
by Jan Pazdziora 19 Apr '12

19 Apr '12

branding/templates/footer.pxt | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++-- 17 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 5a0ab02b4f7bfdd22cd20c63aa79e8aea4c02a56 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 12:25:43 2012 +0200 Update the copyright year info on .pxt pages. diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt index 34dce1e..10b8d70 100644 --- a/branding/templates/footer.pxt +++ b/branding/templates/footer.pxt @@ -4,7 +4,7 @@ <pxt-use class="Sniglets::Utils" /> <pxt-use class="Sniglets::Users" /> <div id="footer"> - Copyright © 2002-11 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> <div style="color: black"> Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a> </div> commit 5f1aae8e594514f57a49b2cca20036ab96c73c7f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 19 12:24:37 2012 +0200 Removed double-dash from WebUI copyright notice. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index b6080e7..5ac2d19 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -1161,7 +1161,7 @@ <target>{0}-টি সিস্টেম নির্বাচন করা হয়েছে</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index a18064b..1e16e2a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -1161,11 +1161,11 @@ <target>{0} Systeme ausgew&auml;hlt</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> 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 6ed1aac..29e44ee 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 @@ -1177,7 +1177,7 @@ </trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index bd5c9b9..d031d3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -1161,11 +1161,11 @@ <target>{0} sistemas seleccionados</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. Todos los derechos reservados.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Todos los derechos reservados.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 001343a..94a39d4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -1161,11 +1161,11 @@ <target>{0} systèmes sélectionnés</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. Tous droits réservés.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Tous droits réservés.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 7ca6f57..5caeaaa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -1161,11 +1161,11 @@ <target>{0} સિસ્ટમો પસંદ થયેલ છે</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index a5bb60b..004d4d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -1161,11 +1161,11 @@ <target>{0} सिस्टम चुना गया</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>कॉपीराइट &#169; 2002--12 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target></trans-unit> + <target>कॉपीराइट &#169; 2002&#x2012;12 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 2885d8f..d150f09 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -1161,11 +1161,11 @@ <target>{0} sistemi selezionati</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. Tutti i diritti riservati.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. Tutti i diritti riservati.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index cccc705..01170f9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -1161,11 +1161,11 @@ <target>{0} システムが選択されました</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 8fe4236..053a33a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -1161,11 +1161,11 @@ <target>{0} 시스템이 선택되었습니다</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</target></trans-unit> + <target>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index fbadf2d..3afa7bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -1161,11 +1161,11 @@ <target>{0} ਸਿਸਟਮ ਚੁਣੇ ਗਏ</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>ਕਾਪੀਰਾਈਟ &#169; 2002--12 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target></trans-unit> + <target>ਕਾਪੀਰਾਈਟ &#169; 2002&#x2012;12 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index ff43a13..5fa0740 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -1161,11 +1161,11 @@ <target>{0} sistemas selecionados</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>Direitos Autorais &#169; 2002--12 Red Hat, Inc. Todos os direitos reservados.</target></trans-unit> + <target>Direitos Autorais &#169; 2002&#x2012;12 Red Hat, Inc. Todos os direitos reservados.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 3634959..a28c158 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -1161,11 +1161,11 @@ <target>{0} систем(ы) выбрано</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>&#169; 2002--12 Red Hat, Inc. Все права защищены.</target></trans-unit> + <target>&#169; 2002&#x2012;12 Red Hat, Inc. Все права защищены.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 9b3826c..ec787cc 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -1161,11 +1161,11 @@ <target>{0} கணினிகள் தேர்வு செய்யப்பட்டன</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>பதிப்புரிமை &#169; 2002--12 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target></trans-unit> + <target>பதிப்புரிமை &#169; 2002&#x2012;12 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 70849b3..2f82537 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -1161,7 +1161,7 @@ <target>选择 {0} 个系统</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 0122e82..90829af 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -1161,11 +1161,11 @@ <target>選擇了 {0} 部系統</target></trans-unit>  <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002--12 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002&#x2012;12 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> - <target>版權所有 &#169; 2002--12 Red Hat, Inc. 保留所有權利。</target></trans-unit> + <target>版權所有 &#169; 2002&#x2012;12 Red Hat, Inc. 保留所有權利。</target></trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> <context-group name="ctx">

1 0

2 commits - java/code
by Tomas Lestach 19 Apr '12

19 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 43 +++++----- 2 files changed, 23 insertions(+), 22 deletions(-) New commits: commit 389ee5d29b993be189921407a6c422a5a64af6d9 Author: Michael Calmer <mc(a)suse.de> Date: Thu Apr 19 11:47:24 2012 +0200 fix has_errata_with_keyword_applied_since_last_reboot query Fixes: com.redhat.rhn.common.db.WrappedSQLException: ORA-00936: missing expression diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index 64560e0..d365719 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -790,7 +790,6 @@ SELECT DISTINCT S.id, S.NAME, <mode name="has_errata_with_keyword_applied_since_last_reboot"> <query params="org_id, user_id, keyword, sid"> - SELECT EXISTS ( SELECT 1 FROM rhnServer S, rhnErrata E, @@ -808,7 +807,6 @@ SELECT DISTINCT S.id, S.NAME, AND EP.errata_id = E.id AND EP.package_id = P.id AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword) - ) </query> </mode> commit 052a263c96767927020b75a3fda8b483319b2af3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 19 12:00:02 2012 +0200 fix PackageEvr handling III this fixes an issue introduced in 02a668 diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index e02c158..7fe23e5 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -17,8 +17,6 @@ package com.redhat.rhn.taskomatic.task.repomd; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.rhnpackage.PackageEvr; -import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; @@ -29,6 +27,8 @@ import org.xml.sax.SAXException; import java.io.ByteArrayOutputStream; import java.io.Writer; +import java.util.HashMap; +import java.util.Map; /** * Primary.xml writer class @@ -288,27 +288,28 @@ public class PrimaryXmlWriter extends RepomdWriter { SimpleAttributesImpl attr = new SimpleAttributesImpl(); attr.addAttribute("name", sanitize(pkgId, pkgCapIter .getString("name"))); - PackageEvr evrObj = parseEvr(sanitize(pkgId, pkgCapIter + Map<String, String> evrMap = parseEvr(sanitize(pkgId, + pkgCapIter .getString("version"))); - if (evrObj.getEpoch() != null || evrObj.getVersion() != null || - evrObj.getRelease() != null) { + if (evrMap.get("epoch") != null || evrMap.get("version") != null || + evrMap.get("release") != null) { attr.addAttribute("flags", getSenseAsString(pkgCapIter .getNumber("sense").longValue())); } - if (evrObj.getEpoch() != null) { - attr.addAttribute("epoch", evrObj.getEpoch()); + if (evrMap.get("epoch") != null) { + attr.addAttribute("epoch", evrMap.get("epoch")); } - else if (evrObj.getVersion() != null) { + else if (evrMap.get("version") != null) { attr.addAttribute("epoch", "0"); } - if (evrObj.getVersion() != null) { - attr.addAttribute("ver", evrObj.getVersion()); + if (evrMap.get("version") != null) { + attr.addAttribute("ver", evrMap.get("version")); } - if (evrObj.getRelease() != null) { - attr.addAttribute("rel", evrObj.getRelease()); + if (evrMap.get("release") != null) { + attr.addAttribute("rel", evrMap.get("release")); } localHandler.startElement("rpm:entry", attr); @@ -322,14 +323,17 @@ public class PrimaryXmlWriter extends RepomdWriter { * @param evr package evr info * @return package evr object */ - private static PackageEvr parseEvr(String evr) { - String epoch = null, version = null, release = null; + private static Map<String, String> parseEvr(String evr) { + Map map = new HashMap<String, String>(); + map.put("epoch", null); + map.put("version", null); + map.put("release", null); if (evr != null) { String[] parts = evr.split(":"); String vr; if (parts.length != 1) { - epoch = parts[0]; + map.put("epoch", parts[0]); vr = parts[1]; } else { @@ -339,16 +343,15 @@ public class PrimaryXmlWriter extends RepomdWriter { int dash = vr.lastIndexOf("-"); if (dash == -1) { - version = vr; + map.put("version", vr); } else { - version = vr.substring(0, dash); - release = vr.substring(dash + 1); + map.put("version", vr.substring(0, dash)); + map.put("release", vr.substring(dash + 1)); } } - return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version, - release); + return map; } /**

1 0

java/conf
by Tomas Lestach 19 Apr '12

19 Apr '12

java/conf/default/rhn_taskomatic_daemon.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cfaa58b73ef80092e2371c81a22aaa3dd3650ca6 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 19 10:39:07 2012 +0200 increase taskomatic memory to prevent repo generation failures for large channels diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf index c6fc402..f26c0f6 100644 --- a/java/conf/default/rhn_taskomatic_daemon.conf +++ b/java/conf/default/rhn_taskomatic_daemon.conf @@ -89,7 +89,7 @@ wrapper.java.additional.1=-Dibm.dst.compatibility=true wrapper.java.initmemory=256 # Maximum Java Heap Size (in MB) -wrapper.java.maxmemory=512 +wrapper.java.maxmemory=1024 # Application parameters. Add parameters as needed starting from 1 #wrapper.app.parameter.1=<YourMainClass>

1 0

java/code
by Tomas Lestach 18 Apr '12

18 Apr '12

java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 ++ java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 1 + java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java | 2 ++ java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 8 +++++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 8 +++++--- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf | 5 +++-- java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 8 +++++--- 7 files changed, 23 insertions(+), 11 deletions(-) New commits: commit 89ec6aedc9640768daf0eb984e72486f9d7e5400 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 18 16:41:28 2012 +0200 803353 - fixing another two broken documentation links - Click here for more information on the differences between text and binary files. - Tip: A full listing of the available macros is listed in the RHN Reference Guide. diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java index 71f1e74..43ac013 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.configuration; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.common.validator.ValidatorResult; @@ -56,6 +57,7 @@ public abstract class BaseAddFilesAction extends RhnAction { StringUtil.displayFileSize(ConfigFile.getMaxFileSize())); request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token")); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); if (isSubmitted(cff)) { ConfigChannel channel = getConfigChannel(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java index a676332..074195b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java @@ -93,6 +93,7 @@ public class FileDetailsAction extends RhnAction { cff.updateFromRevision(request, cr); setupRequestParams(context, cr); request.setAttribute("form", cff); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); return getStrutsDelegate().forwardParams(mapping.findForward("default"), params); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java index 770be15..a0f6cf7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDownloadAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.configuration.files; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.config.ConfigRevision; import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper; import com.redhat.rhn.frontend.action.configuration.ConfigFileForm; @@ -47,6 +48,7 @@ public class FileDownloadAction extends RhnAction { ConfigFileForm cff = (ConfigFileForm) form; request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token")); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); ConfigRevision cr = ConfigActionHelper.findRevision(request); diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf index e5623d9..2accd2c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf @@ -115,9 +115,11 @@ <html:text property="cffMacroStart" size="3" styleId="cffMacroStart" disabled = "${configFileForm.map.filetype == 'symlink'}" /> <bean:message key="filedetails.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" styleId="cffMacroEnd" disabled = "${configFileForm.map.filetype == 'symlink'}" /><br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> - </span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + </span> + </c:if> </td> </tr> <tr id = "contentsRow" diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf index e01f323..d449873 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf @@ -59,9 +59,11 @@ <html:text property="cffMacroStart" size="3" /> <bean:message key="filedetails.add_details.jspf.macro.end" /> <html:text property="cffMacroEnd" size="3" /><br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> - </span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/index.jsp" /> + </span> + </c:if> </td> </tr> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf index 7c07033..af4c355 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/add_details.jspf @@ -31,8 +31,9 @@ <c:out value="${revision.configContent.delimEnd}" /> </rhn:require> <br /> - - <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + <c:if test="${documentation == 'true'}"> + <span class="small-text"><bean:message key="filedetails.jsp.tip.macros" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp"/></span> + </c:if> </tr> </c:if> </table> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf index 72cb8be..9151f12 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf @@ -101,10 +101,12 @@ </c:if> </rhn:require> <br /> - <span class="small-text"> - <bean:message key="filedetails.jsp.binarytoggletip" + <c:if test="${documentation == 'true'}"> + <span class="small-text"> + <bean:message key="filedetails.jsp.binarytoggletip" arg0="/rhn/help/reference/en-US/s1-sm-configuration.jsp" /> - </span> + </span> + </c:if> </c:otherwise> </c:choose> </td>

1 0

java/code
by Tomas Lestach 18 Apr '12

18 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 55 ++++++++++ java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java | 37 ++++++ java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 5 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14 ++ java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 6 + java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 40 +++++++ java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp | 25 ++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 java/code/webapp/WEB-INF/struts-config.xml | 10 + 10 files changed, 197 insertions(+), 1 deletion(-) New commits: commit 433bd3a310f38577ff3066414a2f035e4c310e47 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Tue Apr 17 15:31:06 2012 +0200 Show systems that need reboot because of an errata. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index cdb0cc5..64560e0 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -757,6 +757,61 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID <elaborator name="is_virtual_host" /> </mode> +<query name="having_errata_with_keyword_applied_since_last_reboot_list" params="org_id, user_id, keyword"> +SELECT DISTINCT S.id, S.NAME, + (SELECT 1 + FROM rhnServerFeaturesView SFV + WHERE SFV.server_id = S.id + AND SFV.label = 'ftr_system_grouping') AS selectable + FROM rhnServer S, + rhnErrata E, + rhnServerInfo SI, + rhnServerPackage SP, + rhnPackage P, + rhnErrataPackage EP + WHERE S.org_id = :org_id + AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id=:user_id AND USP.server_id = S.id) + AND SI.server_id = S.id + AND SP.server_id = S.id + AND P.evr_id = SP.evr_id + AND P.name_id = SP.name_id + AND EP.errata_id = E.id AND EP.package_id = P.id + AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime + AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword) +</query> + +<mode name="having_errata_with_keyword_applied_since_last_reboot" class="com.redhat.rhn.frontend.dto.SystemOverview"> + <query name="having_errata_with_keyword_applied_since_last_reboot_list"/> + <elaborator name="system_overview" /> + <elaborator name="entitlements" /> + <elaborator name="is_virtual_guest" /> + <elaborator name="is_virtual_host" /> +</mode> + +<mode name="has_errata_with_keyword_applied_since_last_reboot"> + <query params="org_id, user_id, keyword, sid"> + SELECT EXISTS ( + SELECT 1 + FROM rhnServer S, + rhnErrata E, + rhnServerInfo SI, + rhnServerPackage SP, + rhnPackage P, + rhnErrataPackage EP + WHERE S.org_id = :org_id + AND S.id = :sid + AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id=:user_id AND USP.server_id = S.id) + AND SI.server_id = S.id + AND SP.server_id = S.id + AND P.evr_id = SP.evr_id + AND P.name_id = SP.name_id + AND EP.errata_id = E.id AND EP.package_id = P.id + AND (to_date('1970-01-01', 'YYYY-MM-DD') + numtodsinterval(S.last_boot, 'second')) < SP.installtime + AND E.id IN (SELECT EK.errata_id FROM rhnErrataKeyword EK WHERE EK.keyword = :keyword) + ) + </query> +</mode> + <mode name="inactive" class="com.redhat.rhn.frontend.dto.SystemOverview"> <query params="org_id, user_id, checkin_threshold"> SELECT S.id, S.NAME, diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java new file mode 100644 index 0000000..e33dce7 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/RequiringRebootSetupAction.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2012 Novell + * + * 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.frontend.action.systems; + +import org.apache.struts.action.ActionForm; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.manager.system.SystemManager; + +/** + * InactiveSetupAction + * @version $Rev$ + */ +public class RequiringRebootSetupAction extends BaseSystemsAction { + + @Override + protected DataResult<SystemOverview> getDataResult(User user, + PageControl pc, ActionForm formIn) { + return SystemManager.requiringRebootList(user, null); + } + +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java index fc6ce5b..f82ab20 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java @@ -59,6 +59,7 @@ public class SystemOverviewAction extends RhnAction { .RECEIVE_NOTIFICATIONS}; /** {@inheritDoc} */ + @Override public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); @@ -106,6 +107,9 @@ public class SystemOverviewAction extends RhnAction { boolean hasUpdates = criticalErrataCount + nonCriticalErrataCount + upgradablePackagesCount > 0; + // Reboot needed after certain types of updates + boolean rebootRequired = SystemManager.requiresReboot(user, sid); + // Monitoring processRequestForMonitoring(user, s, request); @@ -118,6 +122,7 @@ public class SystemOverviewAction extends RhnAction { SdcHelper.ssmCheck(request, sid, user); + request.setAttribute("rebootRequired", Boolean.valueOf(rebootRequired)); request.setAttribute("unentitled", Boolean.valueOf(s.getEntitlements().isEmpty())); request.setAttribute("systemInactive", Boolean.valueOf(s.isInactive())); request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); 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 afe8387..6ed1aac 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 @@ -5058,6 +5058,13 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit> + <trans-unit id="requiringrebootlist.jsp.header"> + <source>Systems requiring reboot</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/RequiringReboot</context> + <context context-type="sourcefile">/rhn/systems/YourRhn.do</context> + </context-group> + </trans-unit> <trans-unit id="inactivelist.jsp.header"> <source>Inactive Systems</source> @@ -17559,6 +17566,13 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> </trans-unit> + <trans-unit id="sdc.details.overview.requires_reboot"> + <source>The system requires a reboot</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/details/Overview.do</context> + </context-group> + </trans-unit> + <trans-unit id="sdc.details.overview.inactive1"> <source><strong>System not checking in with @@PRODUCT_NAME@@</strong></source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml index 97b6522..5400455 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml @@ -111,6 +111,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context context-type="sourcefile">Systems Navigation Menu</context> </context-group> </trans-unit> + <trans-unit id="Requiring Reboot"> + <source>Requiring Reboot</source> + <context-group name="ctx"> + <context context-type="sourcefile">Systems Navigation Menu</context> + </context-group> + </trans-unit> <trans-unit id="duplicate.systems.nav.ips"> <source>Duplicate IP Address</source> diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 23be330..78240dc 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -196,6 +196,46 @@ public class SystemManager extends BaseManager { return m.execute(params); } + /** + * @param user + * Currently logged in user. + * @param sid + * System id + * @return true if the system requires a reboot i.e: because kernel updates. + */ + public static boolean requiresReboot(User user, Long sid) { + SelectMode m = ModeFactory.getMode("System_queries", + "has_errata_with_keyword_applied_since_last_reboot"); + Map params = new HashMap(); + params.put("user_id", user.getId()); + params.put("org_id", user.getOrg().getId()); + params.put("sid", sid); + params.put("keyword", "reboot_suggested"); + DataResult dr = m.execute(params); + return !dr.isEmpty(); + } + + /** + * Returns list of systems requiring a reboot i.e: because kernel updates, + * visible to user, sorted by name. + * + * @param user + * Currently logged in user. + * @param pc + * PageControl + * @return list of SystemOverviews. + */ + public static DataResult<SystemOverview> requiringRebootList(User user, + PageControl pc) { + SelectMode m = ModeFactory.getMode("System_queries", + "having_errata_with_keyword_applied_since_last_reboot"); + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", user.getOrg().getId()); + params.put("user_id", user.getId()); + params.put("keyword", "reboot_suggested"); + Map<String, Object> elabParams = new HashMap<String, Object>(); + return makeDataResult(params, elabParams, pc, m); + } /** * Gets the latest upgradable packages for a system diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index a79d842..c153626 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -37,6 +37,7 @@ <rhn-tab name="All" url="/rhn/systems/SystemList.do"/> <rhn-tab name="Virtual Systems" url="/rhn/systems/VirtualSystemsList.do"/> <rhn-tab name="Out of Date" url="/rhn/systems/OutOfDate.do"/> + <rhn-tab name="Requiring Reboot" url="/rhn/systems/RequiringReboot.do"/> <rhn-tab name="Unentitled" url="/rhn/systems/Unentitled.do"/> <rhn-tab name="Ungrouped" url="/rhn/systems/Ungrouped.do" acl="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/> <rhn-tab name="Inactive" url="/rhn/systems/Inactive.do"/> diff --git a/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp new file mode 100644 index 0000000..d5cb310 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/systems/requiringrebootlist.jsp @@ -0,0 +1,25 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> + +<html:xhtml/> +<html> +<head> + <meta name="page-decorator" content="none" /> +</head> +<body> +<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="system.common.systemAlt" + helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-list-inact"> + <bean:message key="requiringrebootlist.jsp.header"/> +</rhn:toolbar> + +<rl:listset name="systemListSet" legend="system"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %> +</rl:listset> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 40d220b..d69645b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -22,7 +22,10 @@ <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> </c:if> </c:when> - + <c:when test="${rebootRequired}"> + <img src="/img/restart.png"/><bean:message key="sdc.details.overview.requires_reboot"/> + <bean:message key="sdc.details.overview.schedulereboot" arg0="/network/systems/details/reboot_confirm.pxt?sid=${system.id}"/> + </c:when> <c:when test="${hasUpdates}"> <c:choose> <c:when test="${criticalErrataCount > 0}"> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 591c766..88dc052 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -2707,6 +2707,16 @@ path="/WEB-INF/pages/systems/inactivelist.jsp"/> </action> + <action path="/systems/RequiringReboot" + scope="request" + input="/WEB-INF/pages/systems/requiringreboot.jsp" + type="com.redhat.rhn.frontend.action.systems.RequiringRebootSetupAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="postRequiredIfSubmitted" value="true" /> + <forward name="default" + path="/WEB-INF/pages/systems/requiringrebootlist.jsp"/> + </action> + <action path="/systems/Registered" scope="request" name="recentlyRegisteredSystemsForm"

1 0

Changes to 'refs/tags/spacewalk-proxy-1.8.3-1'
by Miroslav Suchý 18 Apr '12

18 Apr '12

Tag 'spacewalk-proxy-1.8.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-18 12:43 +0000 Tagging package [spacewalk-proxy] version [1.8.3-1] in directory [proxy/proxy/]. Changes since spacewalk-proxy-1.8.2-1: Miroslav Suchý (2): add pylint warning Automatic commit of package [spacewalk-proxy] release [1.8.3-1]. --- proxy/proxy/apacheHandler.py | 1 + proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

2 commits - proxy/proxy rel-eng/packages
by Miroslav Suchý 18 Apr '12

18 Apr '12

proxy/proxy/apacheHandler.py | 1 + proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit c0a16a2bcb40f0975d1ab5b68438d3fb58d82b82 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 18 14:43:54 2012 +0200 Automatic commit of package [spacewalk-proxy] release [1.8.3-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index e03fc8b..f77f074 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -334,6 +334,9 @@ fi %changelog +* Wed Apr 18 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.3-1 +- add pylint warning + * Wed Apr 18 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.2-1 - move pylint directive up - ignore false pylint warning diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index baeacd5..b786896 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.8.2-1 proxy/proxy/ +1.8.3-1 proxy/proxy/ commit d5ed6e99e16d95927e189b14b72fee399c0e3609 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 18 14:41:51 2012 +0200 add pylint warning f16 wants that up, el6 down... sigh. diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py index 3a91d71..9664b01 100644 --- a/proxy/proxy/apacheHandler.py +++ b/proxy/proxy/apacheHandler.py @@ -64,6 +64,7 @@ def getComponentType(req): proxy_server_id) # pylint: disable=W0702 except: + # pylint: disable=W0702 # incase called prior to the log files being initialized pass if last_visited == proxy_server_id:

1 0

Changes to 'refs/tags/spacewalk-proxy-1.8.2-1'
by Miroslav Suchý 18 Apr '12

18 Apr '12

Tag 'spacewalk-proxy-1.8.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-18 12:23 +0000 Tagging package [spacewalk-proxy] version [1.8.2-1] in directory [proxy/proxy/]. Changes since spacewalk-java-1.8.49-1: Miroslav Suchý (3): ignore false pylint warning move pylint directive up Automatic commit of package [spacewalk-proxy] release [1.8.2-1]. Tomas Lestach (1): modify SecurityErrataOverview.callaback --- java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 19 +++++++--- proxy/proxy/apacheHandler.py | 2 - proxy/proxy/apacheServer.py | 2 - proxy/proxy/rhnProxyAuth.py | 1 proxy/proxy/spacewalk-proxy.spec | 6 ++- rel-eng/packages/spacewalk-proxy | 2 - 6 files changed, 24 insertions(+), 8 deletions(-) ---

1 0

3 commits - proxy/proxy rel-eng/packages
by Miroslav Suchý 18 Apr '12

18 Apr '12

proxy/proxy/apacheHandler.py | 2 +- proxy/proxy/apacheServer.py | 2 +- proxy/proxy/rhnProxyAuth.py | 1 + proxy/proxy/spacewalk-proxy.spec | 6 +++++- rel-eng/packages/spacewalk-proxy | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) New commits: commit bf16be2096b93746ce2392c1151b47391a3599dc Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 18 14:23:02 2012 +0200 Automatic commit of package [spacewalk-proxy] release [1.8.2-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index da0dd63..e03fc8b 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -334,6 +334,10 @@ fi %changelog +* Wed Apr 18 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.2-1 +- move pylint directive up +- ignore false pylint warning + * Tue Apr 17 2012 Jan Pazdziora 1.8.1-1 - 811990 - refresh proxy auth cache for hostname changes (shughes(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index e6ccc5d..baeacd5 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.8.1-1 proxy/proxy/ +1.8.2-1 proxy/proxy/ commit af9d59b9fcf8d25262e34e700c3fa07f7e778a07 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 18 14:16:31 2012 +0200 move pylint directive up diff --git a/proxy/proxy/apacheHandler.py b/proxy/proxy/apacheHandler.py index 257284a..3a91d71 100644 --- a/proxy/proxy/apacheHandler.py +++ b/proxy/proxy/apacheHandler.py @@ -62,8 +62,8 @@ def getComponentType(req): try: log_debug(4, "last_visited", last_visited, "; proxy server id", proxy_server_id) + # pylint: disable=W0702 except: - # pylint: disable=W0702 # incase called prior to the log files being initialized pass if last_visited == proxy_server_id: diff --git a/proxy/proxy/apacheServer.py b/proxy/proxy/apacheServer.py index e43be73..ec6f37c 100644 --- a/proxy/proxy/apacheServer.py +++ b/proxy/proxy/apacheServer.py @@ -63,8 +63,8 @@ class HandlerWrap: ret = f(req) else: raise Exception("Class has no attribute %s" % self.__name) + # pylint: disable=W0702 except: - # pylint: disable=W0702 Traceback(self.__name, req, extra = "Unhandled exception type", severity="unhandled") return apache.HTTP_INTERNAL_SERVER_ERROR commit e03e6aae2f887d0c886647fb639418b3a7ec9e28 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Apr 18 13:56:38 2012 +0200 ignore false pylint warning from hashlib import sha1 produce warning because dir(hashlib) returns nothing, but that function really exists diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py index b26370b..3a2c3ce 100644 --- a/proxy/proxy/rhnProxyAuth.py +++ b/proxy/proxy/rhnProxyAuth.py @@ -22,6 +22,7 @@ import time import socket import xmlrpclib import sys +# pylint: disable=E0611 from hashlib import sha1 ## local imports

1 0

java/code
by Tomas Lestach 18 Apr '12

18 Apr '12

java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 19 +++++++--- 1 file changed, 15 insertions(+), 4 deletions(-) New commits: commit 784cc2641eca61710e6fa6211430b44acac8341e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 18 12:22:23 2012 +0200 modify SecurityErrataOverview.callaback not to fail with newer c3p0, that throws different kind of Exception - exception shall be avoided now diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java index ac1995d..070d561 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java @@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.dto; import com.redhat.rhn.common.db.datasource.RowCallback; import java.sql.ResultSet; +import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; @@ -33,7 +34,7 @@ public class SecurityErrataOverview extends ErrataOverview */ public List<String> getCallBackColumns() { List<String> list = new ArrayList<String>(); - list.add("CVE".toLowerCase()); + list.add("cve"); return list; } @@ -45,9 +46,19 @@ public class SecurityErrataOverview extends ErrataOverview // need to use try-catch, because of use of two // elaborators (only one of them elaborates "CVE") try { - String cve = rs.getString("CVE"); - if (cve != null) { - addCve(cve); + ResultSetMetaData meta = rs.getMetaData(); + int columnCount = meta.getColumnCount(); + // make it faster by skipping the non-cve elaborators + // expected errata_cves_elab returns 2 columns + if (columnCount < 3) { + for (int i = 1; i <= columnCount; i++) { + if (meta.getColumnLabel(i).equals("cve")) { + String cve = rs.getString("cve"); + if (cve != null) { + addCve(cve); + } + } + } } } catch (SQLException e) {

1 0

Changes to 'refs/tags/spacewalk-java-1.8.49-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-java-1.8.49-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 14:54 +0000 Tagging package [spacewalk-java] version [1.8.49-1] in directory [java/]. Changes since spacewalk-java-1.8.48-1: Jan Pazdziora (2): Revert "removing unused string with trans-id Certificate Administrators, Monitoring Administrators, and Configuration Administrators" Automatic commit of package [spacewalk-java] release [1.8.49-1]. --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 9 +++++++++ java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 18 files changed, 150 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit ec4a24eb674127f820b5fa305e39d3498021a4c7 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 16:54:52 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.49-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 8ddf269..f2d3aa6 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.48 +Version: 1.8.49 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.49-1 +- Revert "removing unused string with trans-id Certificate Administrators, + Monitoring Administrators, and Configuration Administrators" + * Tue Apr 17 2012 Jan Pazdziora 1.8.48-1 - Checkstyle fix. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b44c8de..9ebc91b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.48-1 java/ +1.8.49-1 java/

1 0

java/code
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 9 +++++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 9 +++++++++ 16 files changed, 144 insertions(+) New commits: commit 24f21228e06e055d5db0bf57a1aa25241c481b32 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 16:51:06 2012 +0200 Revert "removing unused string with trans-id Certificate Administrators, Monitoring Administrators, and Configuration Administrators" Addressing ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [Certificate Administrators] not found.*** called by com.redhat.rhn.domain.org.usergroup.UserGroupFactory.createUserGroup(UserGroupFactory.java:61) ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [Configuration Administrators] not found.*** called by com.redhat.rhn.domain.org.usergroup.UserGroupFactory.createUserGroup(UserGroupFactory.java:61) ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [Monitoring Administrators] not found.*** called by com.redhat.rhn.domain.org.usergroup.UserGroupFactory.createUserGroup(UserGroupFactory.java:61) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 3914810..242aac1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -7394,8 +7394,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>এই কাজের জন্য চ্যানেলের ব্যবহার ({0}) অনুমোদিত নয়।</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>সার্টিফকেট অ্যাডমিনিস্ট্রেটর</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Monitoring অ্যাডমিনিস্ট্রেটর</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>কনফিগারেশন অ্যাডমিনিস্ট্রেটর</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 87a35e3..33e6b19 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -7419,8 +7419,17 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys <source>The channel access ({0}) is not allowed for this operation.</source> <target>Der Channel-Zugriff ({0}) ist für diese Operation nicht erlaubt.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Zertifikat-Administratoren</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Monitoring-Administratoren</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Konfigurations-Administratoren</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 0cd1f53..af4fe5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -7512,8 +7512,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> </trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + </trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + </trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + </trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 43eff67..8c31852 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -7413,8 +7413,17 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: <source>The channel access ({0}) is not allowed for this operation.</source> <target>El acceso de canal ({0}) no es válido para esta operación.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Administradores de certificados</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Administradores de monitorización</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Administradores de configuración</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index 758ccc7..b09c99c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -7415,8 +7415,17 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : <source>The channel access ({0}) is not allowed for this operation.</source> <target>L'accès au canal ({0}) n'est pas permis pour cette opération.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Administrateurs de certificats</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Administrateurs de contrôle</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Administrateurs de configuration</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 53c5497..ad542b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -7388,8 +7388,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>આ ક્રિયા માટે ચેનલ પ્રવેશ ({0}) ને પરવાનગી આપેલ નથી.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>પ્રમાણપત્ર સંચાલકો</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>મોનીટરીંગ સંચાલકો</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>રૂપરેખાંકન સંચાલકો</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 5a8220e..e039db4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -7388,8 +7388,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>इस कार्य के लिए चैनल पहुँच ({0}) अनुमति प्राप्त नहीं है.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>प्रमाणपत्र प्रशासक</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>मॉनिटरिंग प्रशासक</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>विन्यास प्रशासक</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index b7e04ad..77fb804 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -7412,8 +7412,17 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat <source>The channel access ({0}) is not allowed for this operation.</source> <target>Accesso al canale ({0}) non è un processo valido per questa operazione.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Amministratori del certificato</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Amministratori di monitoring</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Amministratori della configurazione</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index b0a8495..482aaf3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -7412,8 +7412,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>この操作にチャンネルアクセス ({0}) は許可されません。</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>証明書管理者</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Monitoring 管理者</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>設定管理者</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 7361929..08d249a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -7388,8 +7388,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>이 작업에 채널 액세스 ({0})는 허용되지 않습니다. </target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>인증서 관리자</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>모니터링 (Monitoring) 관리자 </target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>설정 관리자 </target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index 8b47cf5..9da1c20 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -7390,8 +7390,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>ਚੈਨਲ ਪਹੁੰਚ ({0}) ਇਸ ਕਾਰਵਾਈ ਲਈ ਮਨਜੂਰ ਨਹੀਂ ਹੈ।</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>ਸਰਟੀਫਿਕੇਟ ਪਰਬੰਧਕ</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>ਨਿਗਰਾਨੀ ਪਰਬੰਧਕ</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>ਸੰਰਚਨਾ ਪਰਬੰਧਕ</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index a6b543d..9ffb9d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -7400,8 +7400,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>O acesso do Canal especificado ({0}) não é permitido para esta operação.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Certificar Administradores</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Administradores de Monitoramento</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Administradores da Configuração</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index f28bca1..746e46e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -7388,8 +7388,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>Этой операции не разрешен доступ к каналу ({0}).</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>Администраторы сертификата</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>Администраторы мониторинга</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>Администраторы конфигурации</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index 2682ac8..4797ae3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -7388,8 +7388,17 @@ url பின்பற்றி செயலிழக்கப்பட்ட <source>The channel access ({0}) is not allowed for this operation.</source> <target>இந்த செயல்பாட்டிற்கு ({0}) சேனலை அனுமதிக்கவில்லை.</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>சான்றிதழ் நிர்வாகிகள்</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>நிர்வாகிகளை கண்காணித்தல்</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>கட்டமைப்பு நிர்வாகிகள்</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index 597a61b..a1958fa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -7413,8 +7413,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>这个操作不允许频道访问（{0}）。</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>证书管理员</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>监控管理员</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>配置管理员</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index d670aef..b3edd47 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -7387,8 +7387,17 @@ Follow this url to see the full list of inactive systems: <source>The channel access ({0}) is not allowed for this operation.</source> <target>這項作業不允許頻道存取（{0}）。</target></trans-unit> + <trans-unit id="Certificate Administrators"> + <source>Certificate Administrators</source> + <target>認證管理員</target></trans-unit> + <trans-unit id="Monitoring Administrators"> + <source>Monitoring Administrators</source> + <target>監控管理員</target></trans-unit> + <trans-unit id="Configuration Administrators"> + <source>Configuration Administrators</source> + <target>設定管理員</target></trans-unit> <trans-unit id="user.unspecified.name"> <source>(unspecified)</source>

1 0

Changes to 'refs/tags/spacewalk-java-1.8.48-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-java-1.8.48-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 14:26 +0000 Tagging package [spacewalk-java] version [1.8.48-1] in directory [java/]. Changes since spacewalk-java-1.8.47-1: Jan Pazdziora (2): Checkstyle fix. Automatic commit of package [spacewalk-java] release [1.8.48-1]. --- java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 4 ++-- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b71aac955c3e755601ac17941eabada87666c17d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 16:26:33 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.48-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6c704b6..8ddf269 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.47 +Version: 1.8.48 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.48-1 +- Checkstyle fix. + * Tue Apr 17 2012 Jan Pazdziora 1.8.47-1 - Make the Invalid prefix error localizable. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 9163f14..b44c8de 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.47-1 java/ +1.8.48-1 java/

1 0

java/code
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c5b6cb3823645a59bb9a886107bd41831a2052ca Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 16:20:05 2012 +0200 Checkstyle fix. Addressing Starting audit... ./code/src/com/redhat/rhn/manager/user/CreateUserCommand.java:232: Line is longer than 92 characters. Audit done. diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index 1d18ba9..fa16d7c 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -228,8 +228,8 @@ public class CreateUserCommand { // Make sure whether prefix is valid, if it is set SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes(); if (!validPrefixes.contains(user.getPrefix())) { - errors.add(new ValidatorError( - "error.user_invalid_prefix", user.getPrefix(), validPrefixes.toString())); + errors.add(new ValidatorError("error.user_invalid_prefix", + user.getPrefix(), validPrefixes.toString())); } } }

1 0

Changes to 'refs/tags/spacewalk-java-1.8.47-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-java-1.8.47-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 13:32 +0000 Tagging package [spacewalk-java] version [1.8.47-1] in directory [java/]. Changes since spacewalk-selinux-1.8.1-1: Jan Pazdziora (2): Make the Invalid prefix error localizable. Automatic commit of package [spacewalk-java] release [1.8.47-1]. --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 +++++++ java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 +-- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 93e474f72e14c592d817488cd11d8c0c1b4e956b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 15:32:37 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.47-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 405f5bb..6c704b6 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.46 +Version: 1.8.47 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.47-1 +- Make the Invalid prefix error localizable. + * Tue Apr 17 2012 Jan Pazdziora 1.8.46-1 - fix ErrataHandlerTest (tlestach(a)redhat.com) - 812053 - fix the ErrataHandler.clone method (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index e3ab2e7..9163f14 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.46-1 java/ +1.8.47-1 java/

1 0

java/code
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 +++++++ java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 8ce92515891c64b2e27e534377601add6c7bf17d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 14:48:42 2012 +0200 Make the Invalid prefix error localizable. Addressing ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [Invalid prefix [XX]. Must be one of [ , Dr., Hr., Miss, Mr., Mrs., Ms., Sr.]] not found.*** called by com.redhat.rhn.frontend.struts.XmlMessageResources.getMessage(XmlMessageResources.java:85) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 0bfbdd5..0cd1f53 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1215,6 +1215,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" </context-group> </trans-unit> + <trans-unit id="error.user_invalid_prefix"> +<source>Invalid prefix [{0}]. Must be one of {1}.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/CreateUser</context> + </context-group> + </trans-unit> + <trans-unit id="login"> <source>Desired Login</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index 79a5be7..1d18ba9 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -229,8 +229,7 @@ public class CreateUserCommand { SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes(); if (!validPrefixes.contains(user.getPrefix())) { errors.add(new ValidatorError( - "Invalid prefix [" + user.getPrefix() + "]. Must be one of " + - validPrefixes.toString())); + "error.user_invalid_prefix", user.getPrefix(), validPrefixes.toString())); } } }

1 0

Changes to 'refs/tags/spacewalk-selinux-1.8.1-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-selinux-1.8.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 09:34 +0000 Tagging package [spacewalk-selinux] version [1.8.1-1] in directory [selinux/spacewalk-selinux/]. Changes since spacewalk-setup-1.8.6-1: Jan Pazdziora (2): No need to require httpd_cobbler_content_t that we don't use. Automatic commit of package [spacewalk-selinux] release [1.8.1-1]. --- rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- selinux/spacewalk-selinux/spacewalk.te | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages selinux/spacewalk-selinux
by Jan Pazdziora 17 Apr '12

17 Apr '12

rel-eng/packages/spacewalk-selinux | 2 +- selinux/spacewalk-selinux/spacewalk-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 45d283b8950836226a7fe418f533ba538e6116fa Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 11:34:30 2012 +0200 Automatic commit of package [spacewalk-selinux] release [1.8.1-1]. diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux index 1edcfd4..58865d9 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -1.7.2-1 selinux/spacewalk-selinux/ +1.8.1-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec index 560ceab..ffc094d 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk Name: spacewalk-selinux -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server @@ -113,6 +113,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.1-1 +- No need to require httpd_cobbler_content_t that we don't use. + * Thu Mar 01 2012 Jan Pazdziora 1.7.2-1 - Allow PostgreSQL to use dblink.

1 0

selinux/spacewalk-selinux
by Jan Pazdziora 17 Apr '12

17 Apr '12

selinux/spacewalk-selinux/spacewalk.te | 1 - 1 file changed, 1 deletion(-) New commits: commit 2d18777f477796f5e19dfe399d91b9973bdffe60 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 11:33:37 2012 +0200 No need to require httpd_cobbler_content_t that we don't use. diff --git a/selinux/spacewalk-selinux/spacewalk.te b/selinux/spacewalk-selinux/spacewalk.te index 908958c..c6f5995 100644 --- a/selinux/spacewalk-selinux/spacewalk.te +++ b/selinux/spacewalk-selinux/spacewalk.te @@ -84,7 +84,6 @@ optional_policy(` optional_policy(` gen_require(` type cobblerd_t; - type httpd_cobbler_content_t; ') read_files_pattern(cobblerd_t, spacewalk_data_t, spacewalk_data_t); allow cobblerd_t spacewalk_data_t:file { getattr link unlink rename };

1 0

Changes to 'refs/tags/spacewalk-web-1.8.10-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-web-1.8.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:54 +0000 Tagging package [spacewalk-web] version [1.8.10-1] in directory [web/]. Changes since spacewalk-java-1.8.46-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-web] release [1.8.10-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-setup-1.8.6-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-setup-1.8.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:55 +0000 Tagging package [spacewalk-setup] version [1.8.6-1] in directory [spacewalk/setup/]. Changes since spacewalk-proxy-1.8.1-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-setup] release [1.8.6-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-proxy-1.8.1-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-proxy-1.8.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:54 +0000 Tagging package [spacewalk-proxy] version [1.8.1-1] in directory [proxy/proxy/]. Changes since spacewalk-java-1.8.46-1: Jan Pazdziora (2): Automatic commit of package [spacewalk-web] release [1.8.10-1]. Automatic commit of package [spacewalk-proxy] release [1.8.1-1]. --- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) ---

1 0

3 commits - proxy/proxy rel-eng/packages spacewalk/setup web/spacewalk-web.spec
by Jan Pazdziora 17 Apr '12

17 Apr '12

proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- rel-eng/packages/spacewalk-setup | 2 +- rel-eng/packages/spacewalk-web | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- web/spacewalk-web.spec | 5 ++++- 6 files changed, 15 insertions(+), 6 deletions(-) New commits: commit 2a3106be9bee7d92cadbcdccedf88ad6187bac1e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:55:14 2012 +0200 Automatic commit of package [spacewalk-setup] release [1.8.6-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index be6a65e..26c1762 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.8.5-1 spacewalk/setup/ +1.8.6-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 708c31e..112064d 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.8.5 +Version: 1.8.6 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man8/spacewalk-make-mount-points* %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.6-1 +- Create deploy.sql on PostgreSQL as well (mzazrivec(a)redhat.com) + * Tue Apr 10 2012 Jan Pazdziora 1.8.5-1 - To support the whole Unicode with idn_to_ascii, we need to specify utf8. - The spacewalk-setup script does not seem to need Net::LibIDN directly. commit ca1a82f08bd385fd4687971529a551ba35c196c6 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:54:57 2012 +0200 Automatic commit of package [spacewalk-proxy] release [1.8.1-1]. diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index bb6dde5..da0dd63 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -334,6 +334,9 @@ fi %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.1-1 +- 811990 - refresh proxy auth cache for hostname changes (shughes(a)redhat.com) + * Fri Mar 02 2012 Jan Pazdziora 1.7.12-1 - Update the copyright year info. diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 918ccbd..e6ccc5d 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.7.12-1 proxy/proxy/ +1.8.1-1 proxy/proxy/ commit 83ddae6a86989c58dbf38e0da6894cb3d3f8652f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:54:47 2012 +0200 Automatic commit of package [spacewalk-web] release [1.8.10-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index a29e1ae..689297e 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.9-1 web/ +1.8.10-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index e55d6a4..68a0ea5 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.9 +Version: 1.8.10 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.10-1 +- Broken link patch submitted on behalf of Michael Calmer (sherr(a)redhat.com) + * Thu Apr 12 2012 Stephen Herr <sherr(a)redhat.com> 1.8.9-1 - 812031 - Update perl channel-select-dropdowns to use the same hierarchical sort as java pages (sherr(a)redhat.com)

1 0

Changes to 'refs/tags/spacewalk-java-1.8.46-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-java-1.8.46-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:54 +0000 Tagging package [spacewalk-java] version [1.8.46-1] in directory [java/]. Changes since spacewalk-backend-1.8.19-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-java] release [1.8.46-1]. --- java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 17 Apr '12

17 Apr '12

java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 5ca5d845f2b838cc33b663313472335d262bdba7 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:54:24 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.46-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4067f69..405f5bb 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.45 +Version: 1.8.46 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.46-1 +- fix ErrataHandlerTest (tlestach(a)redhat.com) +- 812053 - fix the ErrataHandler.clone method (tlestach(a)redhat.com) +- create a test erratum with keyword (tlestach(a)redhat.com) +- refactor PackageEvr handling II (tlestach(a)redhat.com) + * Fri Apr 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.45-1 - 809579 - make system snapshot when changing server entitlements using API (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 3a5bd77..e3ab2e7 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.45-1 java/ +1.8.46-1 java/

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.19-1'
by Jan Pazdziora 17 Apr '12

17 Apr '12

Tag 'spacewalk-backend-1.8.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-17 08:53 +0000 Tagging package [spacewalk-backend] version [1.8.19-1] in directory [backend/]. Changes since spacewalk-utils-1.8.6-1: Jan Pazdziora (3): Workaround httplib in 2.4 which did not have the responses dictionary. The mod_wsgi insists on having something after the numeric value on the Status line. Automatic commit of package [spacewalk-backend] release [1.8.19-1]. Milan Zazrivec (1): Create deploy.sql on PostgreSQL as well Miroslav Suchý (1): 812789 - write nicer error message in case you are missing rpm files Tomas Lestach (4): refactor PackageEvr handling II create a test erratum with keyword 812053 - fix the ErrataHandler.clone method fix ErrataHandlerTest --- backend/satellite_tools/disk_dumper/iss.py | 2 backend/spacewalk-backend.spec | 9 + backend/wsgi/wsgiRequest.py | 7 + java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java | 8 - java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 1 java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java | 7 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 15 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 -- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 10 -- java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 8 - java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 46 +++++----- rel-eng/packages/spacewalk-backend | 2 spacewalk/setup/lib/Spacewalk/Setup.pm | 15 +++ 14 files changed, 80 insertions(+), 62 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 17 Apr '12

17 Apr '12

backend/spacewalk-backend.spec | 9 ++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 5d9eec85a65b547ae62da0b1c13a1aa967ed9f21 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:53:44 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.19-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index dc6bb20..54f6b4c 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.18 +Version: 1.8.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -673,6 +673,13 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Apr 17 2012 Jan Pazdziora 1.8.19-1 +- The mod_wsgi insists on having something after the numeric value on the + Status line. +- Workaround httplib in 2.4 which did not have the responses dictionary. +- 812789 - write nicer error message in case you are missing rpm files + (msuchy(a)redhat.com) + * Mon Apr 16 2012 Jan Pazdziora 1.8.18-1 - Sadly, even if cobbler 2.2 is in EPELs, it is not in Fedora -- we need to require just 2.0. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 012a040..56a58ba 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.18-1 backend/ +1.8.19-1 backend/

1 0

2 commits - backend/wsgi
by Jan Pazdziora 17 Apr '12

17 Apr '12

backend/wsgi/wsgiRequest.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 7606e03e7626b4a3cf210e7f6577455fbbca9fce Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:49:50 2012 +0200 The mod_wsgi insists on having something after the numeric value on the Status line. Addressing File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 368, in response self.req.send_http_header() File "/usr/share/rhn/wsgi/wsgiRequest.py", line 80, in send_http_header self.start_response(self.status, self.headers_out.items()) ValueError: status message was not supplied diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py index df5c0a9..b8d4268 100644 --- a/backend/wsgi/wsgiRequest.py +++ b/backend/wsgi/wsgiRequest.py @@ -68,8 +68,11 @@ class WsgiRequest: self.headers_out.add(i[0], i[1]) if hasattr(httplib, "responses"): - # httplib in 2.4 did not have the responses dictionary self.status = self.status + " " + httplib.responses[int(self.status)] + else: + # httplib in 2.4 did not have the responses dictionary + # and mod_wsgi insists on having something after the numeric value + self.status = self.status + " Status " + self.status if len(self.content_type) > 0: self.headers_out['Content-Type'] = self.content_type commit 5a0f7800223db43eca040017e142346be60796dd Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 17 10:09:29 2012 +0200 Workaround httplib in 2.4 which did not have the responses dictionary. Addressing File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 368, in response self.req.send_http_header() File "/usr/share/rhn/wsgi/wsgiRequest.py", line 70, in send_http_header self.status = self.status + " " + httplib.responses[int(self.status)] AttributeError: 'module' object has no attribute 'responses' diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py index 140192f..df5c0a9 100644 --- a/backend/wsgi/wsgiRequest.py +++ b/backend/wsgi/wsgiRequest.py @@ -67,7 +67,9 @@ class WsgiRequest: for i in self.err_headers_out.items(): self.headers_out.add(i[0], i[1]) - self.status = self.status + " " + httplib.responses[int(self.status)] + if hasattr(httplib, "responses"): + # httplib in 2.4 did not have the responses dictionary + self.status = self.status + " " + httplib.responses[int(self.status)] if len(self.content_type) > 0: self.headers_out['Content-Type'] = self.content_type

1 0

3 commits - java/code
by Tomas Lestach 16 Apr '12

16 Apr '12

java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 1 + java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 10 ++++------ java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) New commits: commit efcb99288904f7b02ca689075200560e6ebb528a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 16 17:13:07 2012 +0200 fix ErrataHandlerTest diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java index 2c7ef0d..515f52b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java @@ -444,7 +444,7 @@ public class ErrataHandlerTest extends BaseHandlerTestCase { Map errataInfo = new HashMap(); - String advisoryName = RandomStringUtils.random(37); + String advisoryName = RandomStringUtils.random(101); populateErrataInfo(errataInfo); errataInfo.put("advisory_name", advisoryName); commit 9670d422b2f707f51c4a22e21a16a070d3b867b3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 16 17:12:04 2012 +0200 812053 - fix the ErrataHandler.clone method return cloned errata list (not an empty array) rename confusing inheritAllPackages -> inheritPackages 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 d2b6bc9..37c2072 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 @@ -879,7 +879,7 @@ public class ErrataHandler extends BaseHandler { private Object[] clone(String sessionKey, String channelLabel, - List<String> advisoryNames, boolean inheritAllPackages) { + List<String> advisoryNames, boolean inheritPackages) { User loggedInUser = getLoggedInUser(sessionKey); Logger log = Logger.getLogger(ErrataFactory.class); @@ -892,7 +892,7 @@ public class ErrataHandler extends BaseHandler { } //if calling cloneAsOriginal, do additional checks to verify a clone - if (!inheritAllPackages) { + if (inheritPackages) { if (!channel.isCloned()) { throw new InvalidChannelException("Cloned channel expected: " + channel.getLabel()); @@ -918,8 +918,6 @@ public class ErrataHandler extends BaseHandler { List<Errata> errataToClone = new ArrayList<Errata>(); List<Errata> errataToPublish = new ArrayList<Errata>(); - List<Errata> toReturn = new ArrayList<Errata>(); - //We loop through once, making sure all the errata exist for (String advisory : advisoryNames) { Errata toClone = lookupErrata(advisory, loggedInUser.getOrg()); @@ -946,12 +944,12 @@ public class ErrataHandler extends BaseHandler { //Now publish them all to the channel in a single shot List<Errata> published = ErrataFactory.publishToChannel(errataToPublish, channel, - loggedInUser, inheritAllPackages); + loggedInUser, inheritPackages); for (Errata e : published) { ErrataFactory.save(e); } - return toReturn.toArray(); + return published.toArray(); } commit 8ba2cd0ffb48d19281c45ad5894a5c766d2df3f9 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 16 17:04:14 2012 +0200 create a test erratum with keyword 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 c6e4b30..63b1e9d 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 @@ -304,6 +304,7 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser { e.setAdvisoryName(name); e.setAdvisoryRel(new Long(2)); e.setLocallyModified(Boolean.FALSE); + e.addKeyword("keyword"); Package testPackage = PackageTest.createTestPackage(); ErrataFile ef;

1 0

java/code
by Tomas Lestach 16 Apr '12

16 Apr '12

java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java | 8 - java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java | 7 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 15 +-- java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 10 -- java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 8 - java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 46 +++++----- 6 files changed, 43 insertions(+), 51 deletions(-) New commits: commit 02a668f857f52316e13f3c41d19f6b1942415beb Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 16 15:55:32 2012 +0200 refactor PackageEvr handling II diff --git a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java index 941bf96..18fa523 100644 --- a/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/action/test/ActionFactoryTest.java @@ -43,6 +43,7 @@ import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageEvr; +import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.domain.rhnpackage.PackageName; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; @@ -448,11 +449,8 @@ public class ActionFactoryTest extends RhnBaseTestCase { d.setPackageName(name); //create packageEvr - PackageEvr evr = new PackageEvr(); - evr.setEpoch("" + System.currentTimeMillis()); - evr.setRelease("1.0"); - evr.setVersion("2.0"); - + PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("" + + System.currentTimeMillis(), "2.0", "1.0"); d.setEvr(evr); ((PackageAction) newA).addDetail(d); } diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java index 9bbf90d..7d0997a 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrComparableTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.rhnpackage.test; import com.redhat.rhn.domain.rhnpackage.PackageEvr; +import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.testing.RhnBaseTestCase; import org.apache.commons.lang.StringUtils; @@ -65,10 +66,8 @@ public class PackageEvrComparableTest extends RhnBaseTestCase { private PackageEvr create(String evr) { String[] values = split(evr); - PackageEvr result = new PackageEvr(); - result.setEpoch(values[0]); - result.setVersion(values[1]); - result.setRelease(values[2]); + PackageEvr result = PackageEvrFactory.lookupOrCreatePackageEvr( + values[0], values[1], values[2]); return result; } 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 7a1dc96..9611a6a 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 @@ -18,6 +18,7 @@ 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.rhnpackage.PackageEvrFactory; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.user.User; @@ -115,15 +116,13 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable String[] existingParts = splitEvr(existing.getNvre()); String[] itemParts = splitEvr(item.getNvre()); - PackageEvr existingEvr = new PackageEvr(); - existingEvr.setEpoch(existingParts[0]); - existingEvr.setVersion(existingParts[1]); - existingEvr.setRelease(existingParts[2]); + PackageEvr existingEvr = PackageEvrFactory + .lookupOrCreatePackageEvr(existingParts[0], + existingParts[1], existingParts[2]); - PackageEvr itemEvr = new PackageEvr(); - itemEvr.setEpoch(itemParts[0]); - itemEvr.setVersion(itemParts[1]); - itemEvr.setRelease(itemParts[2]); + PackageEvr itemEvr = PackageEvrFactory + .lookupOrCreatePackageEvr(itemParts[0], + itemParts[1], itemParts[2]); if (existingEvr.compareTo(itemEvr) < 0) { packageNameIdsToItems.put(item.getIdOne() + "|" + diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java index 276b447..7341041 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java @@ -32,6 +32,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageEvr; +import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; @@ -319,13 +320,10 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { PackageManagerTest.addPackageToChannel("auto-kickstart-TestBootImage", c); Package p = PackageManagerTest. addPackageToChannel("up2date", c); - PackageEvr pevr = p.getPackageEvr(); - pevr.setEpoch("0"); - pevr.setVersion(KickstartScheduleCommand.UP2DATE_VERSION); - pevr.setRelease("0"); + PackageEvr pevr = PackageEvrFactory.lookupOrCreatePackageEvr("0", + KickstartScheduleCommand.UP2DATE_VERSION, "0"); + p.setPackageEvr(pevr); TestUtils.saveAndFlush(p); - TestUtils.saveAndFlush(pevr); - } // Like the number of params on this one? Nice eh? At least its private and diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java index 0def9ab..f1be880 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java @@ -456,12 +456,10 @@ public class PackageManagerTest extends BaseTestCaseWithUser { if (p == null) { p = PackageManagerTest. addPackageToSystemAndChannel("up2date", s, c); - PackageEvr pevr = p.getPackageEvr(); - pevr.setEpoch("0"); - pevr.setVersion(version); - pevr.setRelease("0"); + PackageEvr pevr = PackageEvrFactory.lookupOrCreatePackageEvr("0", + version, "0"); + p.setPackageEvr(pevr); TestUtils.saveAndFlush(p); - TestUtils.saveAndFlush(pevr); } else { PackageManagerTest.associateSystemToPackage(s, p); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index 146879c..e02c158 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -18,6 +18,7 @@ package com.redhat.rhn.taskomatic.task.repomd; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.rhnpackage.PackageEvr; +import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.task.TaskManager; @@ -322,33 +323,32 @@ public class PrimaryXmlWriter extends RepomdWriter { * @return package evr object */ private static PackageEvr parseEvr(String evr) { - PackageEvr evrObj = new PackageEvr(); - - if (evr == null) { - return evrObj; - } - - String[] parts = evr.split(":"); - String vr; - if (parts.length != 1) { - evrObj.setEpoch(parts[0]); - vr = parts[1]; - } - else { - vr = parts[0]; - } + String epoch = null, version = null, release = null; + + if (evr != null) { + String[] parts = evr.split(":"); + String vr; + if (parts.length != 1) { + epoch = parts[0]; + vr = parts[1]; + } + else { + vr = parts[0]; + } - int dash = vr.lastIndexOf("-"); + int dash = vr.lastIndexOf("-"); - if (dash == -1) { - evrObj.setVersion(vr); - } - else { - evrObj.setVersion(vr.substring(0, dash)); - evrObj.setRelease(vr.substring(dash + 1)); + if (dash == -1) { + version = vr; + } + else { + version = vr.substring(0, dash); + release = vr.substring(dash + 1); + } } - return evrObj; + return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version, + release); } /**

1 0

backend/satellite_tools
by Miroslav Suchý 16 Apr '12

16 Apr '12

backend/satellite_tools/disk_dumper/iss.py | 2 ++ 1 file changed, 2 insertions(+) New commits: commit d3f88ad2629c3c36d1fc623643599798cb9b2576 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 16 15:23:39 2012 +0200 812789 - write nicer error message in case you are missing rpm files this can happen when you are exporting channel which has been synced using --no-rpms diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index 668f4b1..c459740 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -883,6 +883,8 @@ class Dumper(dumper.XML_Dumper): #get the dirs to the rpm dirs_to_rpm = os.path.split(path_to_rpm)[0] + if (not rpm['path']): + raise ISSError("Error: Missing RPM under the satellite mount point. (Package id: %s)" % rpm['id'], "") #get the path to the rpm from under the satellite's mountpoint satellite_path = os.path.join(CFG.MOUNT_POINT, rpm['path'])

1 0

spacewalk/setup
by Milan Zazrivec 16 Apr '12

16 Apr '12

spacewalk/setup/lib/Spacewalk/Setup.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit 2f80ca2f832b02d51e02987aa9999c1f87b93a31 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Apr 16 14:56:45 2012 +0200 Create deploy.sql on PostgreSQL as well diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 5e77650..ed4184f 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -39,6 +39,9 @@ use constant SHARED_DIR => "/usr/share/spacewalk/setup"; use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc", "sysconfig", 'rhn', 'postgres', 'main.sql'); +use constant POSTGRESQL_DEPLOY_FILE => File::Spec->catfile("/etc", "sysconfig", + 'rhn', 'postgres', 'deploy.sql'); + use constant DEFAULT_ANSWER_FILE_GLOB => SHARED_DIR . '/defaults.d/*.conf'; @@ -949,7 +952,17 @@ sub postgresql_populate_db { } } - my $sat_schema_deploy = POSTGRESQL_SCHEMA_FILE; + my $sat_schema = POSTGRESQL_SCHEMA_FILE; + my $sat_schema_deploy = POSTGRESQL_DEPLOY_FILE; + + system_or_exit([ "/usr/bin/rhn-config-schema.pl", + "--source=" . $sat_schema, + "--target=" . $sat_schema_deploy, + "--tablespace-name=None" ], + 22, + 'There was a problem populating the deploy.sql file.', + ); + my $logfile = DB_POP_LOG_FILE; my @opts = ('spacewalk-sql', '--select-mode-direct', $sat_schema_deploy);

1 0

Changes to 'refs/tags/spacewalk-utils-1.8.6-1'
by Tomas Lestach 16 Apr '12

16 Apr '12

Tag 'spacewalk-utils-1.8.6-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-16 12:25 +0000 Tagging package [spacewalk-utils] version [1.8.6-1] in directory [utils/]. Changes since spacewalk-1.8.1-1: Tomas Lestach (2): 812812 - make generated SSL certificate publicly available Automatic commit of package [spacewalk-utils] release [1.8.6-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-hostname-rename | 5 +++++ utils/spacewalk-utils.spec | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) ---

1 0

2 commits - rel-eng/packages utils/spacewalk-hostname-rename utils/spacewalk-utils.spec
by Tomas Lestach 16 Apr '12

16 Apr '12

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-hostname-rename | 5 +++++ utils/spacewalk-utils.spec | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) New commits: commit 2bde45e0095403a91d0780c5bb061488fe2e8ce5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 16 14:25:03 2012 +0200 Automatic commit of package [spacewalk-utils] release [1.8.6-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 7dfb5b6..2527b20 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.8.5-1 utils/ +1.8.6-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 63cc902..7064b09 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.8.5 +Version: 1.8.6 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -87,6 +87,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Mon Apr 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.6-1 +- 812812 - make generated SSL certificate publicly available + (tlestach(a)redhat.com) + * Fri Apr 13 2012 Jan Pazdziora 1.8.5-1 - 810313 - new option to list snapshot details (mzazrivec(a)redhat.com) commit 8c7ead33e6acf05ed80b534d1259c492d25c9f15 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 11:21:08 2012 +0200 812812 - make generated SSL certificate publicly available diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename index 23ff455..452317f 100755 --- a/utils/spacewalk-hostname-rename +++ b/utils/spacewalk-hostname-rename @@ -24,6 +24,7 @@ RHN_CONF_FILE=/etc/rhn/rhn.conf SSL_BUILD_DIR=/root/ssl-build ETC_JABBERD_DIR=/etc/jabberd NOCPULSE_INI=/etc/NOCpulse.ini +HTTP_PUB_DIR=/var/www/html/pub/ BOOTSTRAP_SH=/var/www/html/pub/bootstrap/bootstrap.sh BOOTSTRAP_CCO=/var/www/html/pub/bootstrap/client-config-overrides.txt SAT_LOCAL_RULES_CONF=/var/lib/rhn/rhn-satellite-prep/satellite-local-rules.conf @@ -310,6 +311,10 @@ function re-generate_server_ssl_certificate { rpm -Uh $SSL_KEY_PAIR_RPM >>$LOG print_status $? + echo -n "Making new SSL certificate publicly available ... " | tee -a $LOG + /usr/bin/rhn-deploy-ca-cert.pl --source-dir=$SSL_BUILD_DIR --target-dir=$HTTP_PUB_DIR + print_status $? + # copy jabberd certificate, too echo -n "Deploying jabberd certificate ... " | tee -a $LOG NEW_SSL_KEY_PAIR_PACKAGE=$(rpm -qa 'rhn-org-httpd-ssl-key-pair*')

1 0

Changes to 'refs/tags/spacewalk-1.8.1-1'
by Jan Pazdziora 16 Apr '12

16 Apr '12

Tag 'spacewalk-1.8.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-16 12:22 +0000 Tagging package [spacewalk] version [1.8.1-1] in directory [spacewalk/package/]. Changes since spacewalk-backend-1.8.18-1: Jan Pazdziora (1): Automatic commit of package [spacewalk] release [1.8.1-1]. --- rel-eng/packages/spacewalk | 2 +- spacewalk/package/spacewalk.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/package
by Jan Pazdziora 16 Apr '12

16 Apr '12

rel-eng/packages/spacewalk | 2 +- spacewalk/package/spacewalk.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e7f051a2b26881ec60b8e7d98bb42d1afcd07efb Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 16 14:22:08 2012 +0200 Automatic commit of package [spacewalk] release [1.8.1-1]. diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index d10a3a5..dd950a4 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -1.7.3-1 spacewalk/package/ +1.8.1-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index cb0e33c..0358a06 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,7 +1,7 @@ %define release_name Smile Name: spacewalk -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -179,6 +179,9 @@ rm -rf %{buildroot} %{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf %changelog +* Mon Apr 16 2012 Jan Pazdziora 1.8.1-1 +- Require postgresql >= 8.4 (mzazrivec(a)redhat.com) + * Fri Mar 02 2012 Jan Pazdziora 1.7.3-1 - On RHEL 5, we need to explicitly name postgresql84-contrib.

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.18-1'
by Jan Pazdziora 16 Apr '12

16 Apr '12

Tag 'spacewalk-backend-1.8.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-16 12:21 +0000 Tagging package [spacewalk-backend] version [1.8.18-1] in directory [backend/]. Changes since spacewalk-schema-1.8.16-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.8.18-1]. --- backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 16 Apr '12

16 Apr '12

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit fd21260fa350a083f7a64177dafb037f5db49795 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 16 14:21:42 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.18-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2df867b..dc6bb20 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.17 +Version: 1.8.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -673,6 +673,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Mon Apr 16 2012 Jan Pazdziora 1.8.18-1 +- Sadly, even if cobbler 2.2 is in EPELs, it is not in Fedora -- we need to + require just 2.0. + * Mon Apr 16 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.17-1 - add man page for --use-rhn-date and --use-sync-date - 805582 - include even package which does not belong to errata diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 90a5d05..012a040 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.17-1 backend/ +1.8.18-1 backend/

1 0

Changes to 'refs/tags/spacewalk-schema-1.8.16-1'
by Jan Pazdziora 16 Apr '12

16 Apr '12

Tag 'spacewalk-schema-1.8.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-16 12:21 +0000 Tagging package [spacewalk-schema] version [1.8.16-1] in directory [schema/spacewalk/]. Changes since spacewalk-backend-1.8.17-1: Jan Pazdziora (3): 812453 - bring the schema version as recorded in the database in sync with the installed rpms, even if the difference is just the dist tag. Sadly, even if cobbler 2.2 is in EPELs, it is not in Fedora -- we need to require just 2.0. Automatic commit of package [spacewalk-schema] release [1.8.16-1]. Milan Zazrivec (1): Require postgresql >= 8.4 --- backend/spacewalk-backend.spec | 2 +- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema-upgrade | 13 +++++++++---- schema/spacewalk/spacewalk-schema.spec | 6 +++++- spacewalk/package/spacewalk.spec | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Jan Pazdziora 16 Apr '12

16 Apr '12

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 8bca563363d2c3ab198e0cef1dfae2d48a89380e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 16 14:21:13 2012 +0200 Automatic commit of package [spacewalk-schema] release [1.8.16-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 4f54695..b78ad46 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.8.15-1 schema/spacewalk/ +1.8.16-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 842cb92..854d225 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.8.15 +Version: 1.8.16 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Mon Apr 16 2012 Jan Pazdziora 1.8.16-1 +- 812453 - bring the schema version as recorded in the database in sync with + the installed rpms, even if the difference is just the dist tag. + * Fri Apr 13 2012 Jan Pazdziora 1.8.15-1 - 787225 - the Log Size actually checks Log Size Growth. - fix PG lookup_transaction_package stored procedure (tlestach(a)redhat.com)

1 0

backend/spacewalk-backend.spec
by Jan Pazdziora 16 Apr '12

16 Apr '12

backend/spacewalk-backend.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1bd01325e1ad974fe99e0710ecca9825b36bef48 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 16 14:19:42 2012 +0200 Sadly, even if cobbler 2.2 is in EPELs, it is not in Fedora -- we need to require just 2.0. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 9cc9598..2df867b 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -251,7 +251,7 @@ Requires: python-hashlib Requires: PyXML Requires: mod_ssl Requires: %{name}-xml-export-libs -Requires: cobbler >= 2.2.1 +Requires: cobbler >= 2.0.0 Requires: rhnlib >= 2.5.38 Obsoletes: rhns-satellite-tools < 5.3.0 Obsoletes: spacewalk-backend-satellite-tools <= 0.2.7

1 0

spacewalk/package
by Milan Zazrivec 16 Apr '12

16 Apr '12

spacewalk/package/spacewalk.spec | 1 + 1 file changed, 1 insertion(+) New commits: commit 76b6db707c6f3d3372de2e16bea0c805a8be7687 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Apr 16 14:02:02 2012 +0200 Require postgresql >= 8.4 This is to make sure we won't pull in postgresql = 8.1 which would then conflict with postgresql = 8.4 diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 87cfa19..cb0e33c 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -137,6 +137,7 @@ Requires: postgresql84-contrib %else Requires: postgresql-contrib >= 8.4 %endif +Requires: postgresql >= 8.4 %description postgresql Spacewalk is a systems management application that will

1 0

schema/spacewalk
by Jan Pazdziora 16 Apr '12

16 Apr '12

schema/spacewalk/spacewalk-schema-upgrade | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit 4835b74a230bb49641b0e46e723c64f415ce2a2d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 16 13:59:52 2012 +0200 812453 - bring the schema version as recorded in the database in sync with the installed rpms, even if the difference is just the dist tag. diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade index 693b34e..823f7b0 100755 --- a/schema/spacewalk/spacewalk-schema-upgrade +++ b/schema/spacewalk/spacewalk-schema-upgrade @@ -63,17 +63,22 @@ print "Schema upgrade: [$start_schema] -> [$target_schema]\n"; my $retried = 0; RETRY: -if ($start_schema_norm eq $target_schema_norm) { - warn "Your database schema already matches the schema package version [$target_schema_norm].\n"; +if ($start_schema eq $target_schema) { + warn "Your database schema already matches the schema package version [$target_schema].\n"; exit; } +my %upgrade_path; +my @queue = ( $target_schema_norm ); +if ($start_schema_norm eq $target_schema_norm) { + print "The schema version is the same, except for the dist tag.\n"; + @queue = (); + $upgrade_path{$target_schema_norm} = undef; +} if ($start_schema ne $start_schema_norm or $target_schema ne $target_schema_norm) { print "Searching for upgrade path: [$start_schema_norm] -> [$target_schema_norm]\n"; } -my %upgrade_path; -my @queue = ( $target_schema_norm ); while (@queue) { my $t = shift @queue; my @lookup = glob "$SCHEMA_UPGRADE_DIR/*-to-$t";

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.17-1'
by Miroslav Suchý 16 Apr '12

16 Apr '12

Tag 'spacewalk-backend-1.8.17-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-04-16 09:30 +0000 Tagging package [spacewalk-backend] version [1.8.17-1] in directory [backend/]. Changes since spacecmd-1.8.4-1: Miroslav Suchý (4): 805582 - introduce new option --whole-errata to exporter 805582 - include even package which does not belong to errata add man page for --use-rhn-date and --use-sync-date Automatic commit of package [spacewalk-backend] release [1.8.17-1]. --- backend/satellite_tools/disk_dumper/dumper.py | 11 backend/satellite_tools/disk_dumper/iss.py | 139 ++++++++-- backend/satellite_tools/disk_dumper/iss_ui.py | 2 backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 33 ++ backend/satellite_tools/exporter/exportLib.py | 43 ++- backend/spacewalk-backend.spec | 7 rel-eng/packages/spacewalk-backend | 2 7 files changed, 203 insertions(+), 34 deletions(-) ---

1 0

4 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý 16 Apr '12

16 Apr '12

backend/satellite_tools/disk_dumper/dumper.py | 11 backend/satellite_tools/disk_dumper/iss.py | 139 ++++++++-- backend/satellite_tools/disk_dumper/iss_ui.py | 2 backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 33 ++ backend/satellite_tools/exporter/exportLib.py | 43 ++- backend/spacewalk-backend.spec | 7 rel-eng/packages/spacewalk-backend | 2 7 files changed, 203 insertions(+), 34 deletions(-) New commits: commit 4a218be3e28dd5c81993c8daf50b63269e80300f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 16 11:30:09 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.17-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index b7cf687..9cc9598 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.16 +Version: 1.8.17 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -673,6 +673,11 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Mon Apr 16 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.17-1 +- add man page for --use-rhn-date and --use-sync-date +- 805582 - include even package which does not belong to errata +- 805582 - introduce new option --whole-errata to exporter + * Fri Apr 13 2012 Jan Pazdziora 1.8.16-1 - 812329 - adding PostgreSQL configuration and log files to the debug. - 812329 - updating rhn-charsets man page -- update list of value names, no diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index f0d55a8..90a5d05 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.16-1 backend/ +1.8.17-1 backend/ commit 2acac2ae79fe38a2aad1897ca57afb22984a53a8 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 16 11:28:46 2012 +0200 add man page for --use-rhn-date and --use-sync-date diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml index 992c43b..0f7c9c7 100644 --- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml +++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml @@ -46,6 +46,12 @@ A tool that exports satellite content into a directory in an XML format. That co <arg>--end-date=<replaceable>END_DATE</replaceable></arg> </cmdsynopsis> <cmdsynopsis> + <arg>--use-rhn-date</arg> + </cmdsynopsis> + <cmdsynopsis> + <arg>--use-sync-date</arg> + </cmdsynopsis> + <cmdsynopsis> <arg>--whole-errata</arg> </cmdsynopsis> <cmdsynopsis> @@ -157,6 +163,22 @@ A tool that exports satellite content into a directory in an XML format. That co </listitem> </varlistentry> <varlistentry> + <term>--use-rhn-date</term> + <listitem> + <para>Limit exported packages according to the date when + they appeared at Red Hat Network. This is default. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>--use-sync-date</term> + <listitem> + <para>Limit exported packages according to the date they + where pulled into satellite. + </para> + </listitem> + </varlistentry> + <varlistentry> <term>--whole-errata</term> <listitem> <para>Always include package if it belongs to errata which commit 951f7653be36d225237c6664ffc5654b48033d2b Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 16 11:23:56 2012 +0200 805582 - include even package which does not belong to errata if --whole-errata is set, and package does not belong to errata, use package date and not errata date diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index 0b62521..668f4b1 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -244,12 +244,11 @@ class Dumper(dumper.XML_Dumper): try: if self.whole_errata and self.start_date: query = """ select rcp.package_id id, rp.path path - from rhnChannelPackage rcp, rhnPackage rp, - rhnErrataPackage rep, rhnErrata re + from rhnChannelPackage rcp, rhnPackage rp + left join rhnErrataPackage rep on rp.id = rep.package_id + left join rhnErrata re on rep.errata_id = re.id where rcp.package_id = rp.id and rcp.channel_id = :channel_id - and rp.id = rep.package_id - and rep.errata_id = re.id """ else: query = """ @@ -263,13 +262,21 @@ class Dumper(dumper.XML_Dumper): if self.whole_errata: if self.use_rhn_date: query += """ and - re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') - and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ else: query += """ and - re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ elif self.use_rhn_date: query += """ @@ -303,12 +310,11 @@ class Dumper(dumper.XML_Dumper): query = """ select rp.id package_id, TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified - from rhnPackage rp, rhnChannelPackage rcp, - rhnErrataPackage rep, rhnErrata re + from rhnChannelPackage rcp, rhnPackage rp + left join rhnErrataPackage rep on rp.id = rep.package_id + left join rhnErrata re on rep.errata_id = re.id where rcp.channel_id = :channel_id and rcp.package_id = rp.id - and rp.id = rep.package_id - and rep.errata_id = re.id """ else: query = """ @@ -322,13 +328,21 @@ class Dumper(dumper.XML_Dumper): if self.whole_errata: if self.use_rhn_date: query += """ and - re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ else: query += """ and - re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ elif self.use_rhn_date: query += """ @@ -373,20 +387,28 @@ class Dumper(dumper.XML_Dumper): """ if self.start_date: if self.whole_errata: - query += """, rhnErrataFilePackageSource refps, rhnErrataFile ref, rhnErrata re - where refps.package_id = ps.id - and refps.errata_file_id = ref.id - and ref.errata_id = re.id + query += """ + left join rhnErrataFilePackageSource refps on refps.package_id = ps.id + left join rhnErrataFile ref on refps.errata_file_id = ref.id + left join rhnErrata re on ref.errata_id = re.id """ if self.use_rhn_date: query += """ and - re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + ((re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (refps.package_id is NULL + and ps.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and ps.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ else: query += """ and - re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + ((re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + ) or (refps.package_id is NULL + and ps.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and ps.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) + ) """ elif self.use_rhn_date: query += """ diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index 46819af..5c985f1 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -326,26 +326,35 @@ class _ChannelDumper(BaseRowDumper): _query_get_package_ids_by_date_limits_whole_errata = rhnSQL.Statement(""" select rcp.package_id as id - from rhnPackage rp, rhnChannelPackage rcp, + from rhnChannelPackage rcp, rhnPackage rp + left join rhnErrataPackage rep on rp.id = rep.package_id + left join rhnErrata re on rep.errata_id = re.id rhnErrataPackage rep, rhnErrata re where rcp.channel_id = :channel_id and rcp.package_id = rp.id - and rp.id = rep.package_id - and rep.errata_id = re.id - and re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') - and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + and ((re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rcp.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and rcp.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')) + ) """) _query_get_package_ids_by_rhndate_limits_whole_errata = rhnSQL.Statement(""" select rcp.package_id as id - from rhnPackage rp, rhnChannelPackage rcp, - rhnErrataPackage rep, rhnErrata re + from rhnChannelPackage rcp, rhnPackage rp + left join rhnErrataPackage rep on rp.id = rep.package_id + left join rhnErrata re on rep.errata_id = re.id where rcp.channel_id = :channel_id and rcp.package_id = rp.id and rp.id = rep.package_id and rep.errata_id = re.id - and re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') - and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + and ((re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + ) or (rep.package_id is NULL + and rp.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and rp.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS')) + ) """) commit 5846c25d3227ee2f69a934d620c4bd8387b1019f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Apr 13 15:26:45 2012 +0200 805582 - introduce new option --whole-errata to exporter This will export whole errata if it is within given date range. diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 7927bbd..bfc509f 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -195,12 +195,13 @@ class XML_Dumper: data_iterator=h, null_max_members=0) return 0 - def dump_channels(self, channel_labels=None, start_date=None, end_date=None, use_rhn_date=True): + def dump_channels(self, channel_labels=None, start_date=None, end_date=None, use_rhn_date=True, whole_errata=False): log_debug(2) #channels = self._validate_channels(channel_labels=channel_labels) self._write_dump(ChannelsDumper, - channels=channel_labels, start_date=start_date, end_date=end_date, use_rhn_date=use_rhn_date) + channels=channel_labels, start_date=start_date, end_date=end_date, use_rhn_date=use_rhn_date, + whole_errata=whole_errata) return 0 def _send_headers(self, error=0, init_compressed_stream=1): @@ -674,16 +675,18 @@ class ChannelsDumper(exportLib.ChannelsDumper): and c.channel_arch_id = ca.id """) - def __init__(self, writer, channels=[], start_date=None, end_date=None, use_rhn_date=True): + def __init__(self, writer, channels=[], start_date=None, end_date=None, use_rhn_date=True, whole_errata=False): exportLib.ChannelsDumper.__init__(self, writer, channels) self.start_date = start_date self.end_date = end_date self.use_rhn_date = use_rhn_date + self.whole_errata = whole_errata def dump_subelement(self, data): log_debug(6, data) #return exportLib.ChannelsDumper.dump_subelement(self, data) - c = exportLib._ChannelDumper(self._writer, data, self.start_date, self.end_date, self.use_rhn_date) + c = exportLib._ChannelDumper(self._writer, data, self.start_date, self.end_date, + self.use_rhn_date, self.whole_errata) c.dump() def set_iterator(self): diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py index 113a28c..0b62521 100644 --- a/backend/satellite_tools/disk_dumper/iss.py +++ b/backend/satellite_tools/disk_dumper/iss.py @@ -154,7 +154,7 @@ class FileMapper: """ class Dumper(dumper.XML_Dumper): def __init__(self, outputdir, channel_labels, hardlinks, start_date, \ - end_date, use_rhn_date): + end_date, use_rhn_date, whole_errata): dumper.XML_Dumper.__init__(self) self.fm = FileMapper(outputdir) self.mp = outputdir @@ -167,6 +167,7 @@ class Dumper(dumper.XML_Dumper): self.start_date = start_date self.end_date = end_date self.use_rhn_date = use_rhn_date + self.whole_errata = whole_errata if self.start_date: dates = { 'start_date' : self.start_date, @@ -241,24 +242,46 @@ class Dumper(dumper.XML_Dumper): ###BINARY RPM INFO### try: - query = """ - select rcp.package_id id, rp.path path - from rhnChannelPackage rcp, rhnPackage rp - where rcp.package_id = rp.id - and rcp.channel_id = :channel_id + if self.whole_errata and self.start_date: + query = """ select rcp.package_id id, rp.path path + from rhnChannelPackage rcp, rhnPackage rp, + rhnErrataPackage rep, rhnErrata re + where rcp.package_id = rp.id + and rcp.channel_id = :channel_id + and rp.id = rep.package_id + and rep.errata_id = re.id """ + else: + query = """ + select rcp.package_id id, rp.path path + from rhnChannelPackage rcp, rhnPackage rp + where rcp.package_id = rp.id + and rcp.channel_id = :channel_id + """ + if self.start_date: - if self.use_rhn_date: + if self.whole_errata: + if self.use_rhn_date: + query += """ and + re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + else: + query += """ and + re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + elif self.use_rhn_date: query += """ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') """ else: query += """ - and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') - and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + and ((rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) """ - self.brpm_query = rhnSQL.Statement(query) + self.brpm_query = rhnSQL.Statement(query) brpm_data = rhnSQL.prepare(self.brpm_query) #self.brpms is a list of binary rpm info. It is a list of dictionaries, where each dictionary @@ -268,7 +291,6 @@ class Dumper(dumper.XML_Dumper): for ch in self.channel_ids: brpm_data.execute(channel_id=ch['channel_id'], **dates) self.brpms = self.brpms + (brpm_data.fetchall_dict() or []) - except Exception, e: tbout = cStringIO.StringIO() Traceback(mail=0, ostream=tbout, with_locals=1) @@ -277,23 +299,46 @@ class Dumper(dumper.XML_Dumper): ###PACKAGE INFO### #This will grab channel package information for a given channel. try: - query = """ + if self.whole_errata and self.start_date: + query = """ select rp.id package_id, - TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified - from rhnPackage rp, rhnChannelPackage rcp - where rcp.channel_id = :channel_id - and rcp.package_id = rp.id - """ - if self.start_date: - if self.use_rhn_date: + TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified + from rhnPackage rp, rhnChannelPackage rcp, + rhnErrataPackage rep, rhnErrata re + where rcp.channel_id = :channel_id + and rcp.package_id = rp.id + and rp.id = rep.package_id + and rep.errata_id = re.id + """ + else: + query = """ + select rp.id package_id, + TO_CHAR(rp.last_modified, 'YYYYMMDDHH24MISS') last_modified + from rhnPackage rp, rhnChannelPackage rcp + where rcp.channel_id = :channel_id + and rcp.package_id = rp.id + """ + if self.start_date: + if self.whole_errata: + if self.use_rhn_date: + query += """ and + re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + else: + query += """ and + re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + elif self.use_rhn_date: query += """ and rp.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and rp.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') """ else: query += """ - and rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') - and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + and (rcp.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and rcp.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS')) """ self.package_query = rhnSQL.Statement(query) package_data = rhnSQL.prepare(self.package_query) @@ -322,11 +367,28 @@ class Dumper(dumper.XML_Dumper): try: query = """ select ps.id package_id, - TO_CHAR(ps.last_modified,'YYYYMMDDHH24MISS') last_modified, ps.source_rpm_id source_rpm_id + TO_CHAR(ps.last_modified,'YYYYMMDDHH24MISS') last_modified, + ps.source_rpm_id source_rpm_id from rhnPackageSource ps """ if self.start_date: - if self.use_rhn_date: + if self.whole_errata: + query += """, rhnErrataFilePackageSource refps, rhnErrataFile ref, rhnErrata re + where refps.package_id = ps.id + and refps.errata_file_id = ref.id + and ref.errata_id = re.id + """ + if self.use_rhn_date: + query += """ and + re.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + else: + query += """ and + re.modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') + and re.modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') + """ + elif self.use_rhn_date: query += """ where ps.last_modified >= TO_TIMESTAMP(:start_date, 'YYYYMMDDHH24MISS') and ps.last_modified <= TO_TIMESTAMP(:end_date, 'YYYYMMDDHH24MISS') @@ -338,7 +400,7 @@ class Dumper(dumper.XML_Dumper): """ self.source_package_query = rhnSQL.Statement(query) source_package_data = rhnSQL.prepare(self.source_package_query) - source_package_data.execute(**dates) + source_package_data.execute(**dates) #self.src_pkg_info is a list of dictionaries containing the source package information. #The keys for each dictionary are 'package_id', 'last_modified', and 'source_rpm_id'. @@ -558,7 +620,7 @@ class Dumper(dumper.XML_Dumper): pb.printAll(1) for channel in self.channel_ids: self.set_filename(self.fm.getChannelsFile(channel['label'])) - dumper.XML_Dumper.dump_channels(self, [channel], self.start_date, self.end_date, self.use_rhn_date) + dumper.XML_Dumper.dump_channels(self, [channel], self.start_date, self.end_date, self.use_rhn_date, self.whole_errata) log2email(4, "Channel: %s" % channel['label']) log2email(5, "Channel exported to %s" % self.fm.getChannelsFile(channel['label'])) @@ -968,10 +1030,13 @@ class ExporterMain: self.start_date = None self.end_date = None + if self.start_date and self.options.whole_errata: + self.whole_errata = self.options.whole_errata + #verify mountpoint if os.access(self.outputdir, os.F_OK|os.R_OK|os.W_OK): if os.path.isdir(self.outputdir): - self.dumper = Dumper(self.outputdir, self.options.channel, self.options.hard_links, start_date=self.start_date, end_date=self.end_date, use_rhn_date=self.options.use_rhn_date) + self.dumper = Dumper(self.outputdir, self.options.channel, self.options.hard_links, start_date=self.start_date, end_date=self.end_date, use_rhn_date=self.options.use_rhn_date, whole_errata=self.options.whole_errata) self.actionmap = { 'arches' : {'dump' : self.dumper.dump_arches}, 'arches-extra' : {'dump' : self.dumper.dump_server_group_type_server_arches}, diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py b/backend/satellite_tools/disk_dumper/iss_ui.py index 6d8ee7c..be972cf 100644 --- a/backend/satellite_tools/disk_dumper/iss_ui.py +++ b/backend/satellite_tools/disk_dumper/iss_ui.py @@ -42,6 +42,8 @@ class UI: help="Limit exported packages according to the date when they appeared at Red Hat Network."), option( "--use-sync-date", action="store_true", help="Limit exported packages according to the date they where pulled into satellite."), + option( "--whole-errata", action="store_true", + help="Always include package if it belongs to errata which is withing start/end-date range."), option( "--make-isos", action="store", help="Create channel dump isos a directory called satellite-isos. Usage: --make-isos=cd or dvd"), option("-p", "--print-configuration", action="store_true", default=0, diff --git a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml index 4214458..992c43b 100644 --- a/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml +++ b/backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml @@ -46,6 +46,9 @@ A tool that exports satellite content into a directory in an XML format. That co <arg>--end-date=<replaceable>END_DATE</replaceable></arg> </cmdsynopsis> <cmdsynopsis> + <arg>--whole-errata</arg> + </cmdsynopsis> + <cmdsynopsis> <arg>-p</arg> <arg>--print-configuration</arg> </cmdsynopsis> @@ -154,6 +157,14 @@ A tool that exports satellite content into a directory in an XML format. That co </listitem> </varlistentry> <varlistentry> + <term>--whole-errata</term> + <listitem> + <para>Always include package if it belongs to errata which + is withing start/end-date range. + </para> + </listitem> + </varlistentry> + <varlistentry> <term>--make-isos=<replaceable>MAKE_ISOS</replaceable></term> <listitem> <para>Create channel dump isos directory called satellite-isos. diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py index 1646c58..46819af 100644 --- a/backend/satellite_tools/exporter/exportLib.py +++ b/backend/satellite_tools/exporter/exportLib.py @@ -201,11 +201,12 @@ class SatelliteDumper(BaseDumper): class _ChannelDumper(BaseRowDumper): tag_name = 'rhn-channel' - def __init__(self, writer, row, start_date=None, end_date=None, use_rhn_date=True): + def __init__(self, writer, row, start_date=None, end_date=None, use_rhn_date=True, whole_errata=False): BaseRowDumper.__init__(self, writer, row) self.start_date = start_date self.end_date = end_date self.use_rhn_date = use_rhn_date + self.whole_errata = whole_errata def set_attributes(self): channel_id = self._row['id'] @@ -323,10 +324,39 @@ class _ChannelDumper(BaseRowDumper): and rp.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') """) + _query_get_package_ids_by_date_limits_whole_errata = rhnSQL.Statement(""" + select rcp.package_id as id + from rhnPackage rp, rhnChannelPackage rcp, + rhnErrataPackage rep, rhnErrata re + where rcp.channel_id = :channel_id + and rcp.package_id = rp.id + and rp.id = rep.package_id + and rep.errata_id = re.id + and re.modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and re.modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + """) + + _query_get_package_ids_by_rhndate_limits_whole_errata = rhnSQL.Statement(""" + select rcp.package_id as id + from rhnPackage rp, rhnChannelPackage rcp, + rhnErrataPackage rep, rhnErrata re + where rcp.channel_id = :channel_id + and rcp.package_id = rp.id + and rp.id = rep.package_id + and rep.errata_id = re.id + and re.last_modified >= TO_TIMESTAMP(:lower_limit, 'YYYYMMDDHH24MISS') + and re.last_modified <= TO_TIMESTAMP(:upper_limit, 'YYYYMMDDHH24MISS') + """) + # Things that can be overwriten in subclasses def _get_package_ids(self): - return self._get_ids(self._query_get_package_ids_by_date_limits, + if self.start_date and self.whole_errata: + return self._get_ids(self._query_get_package_ids_by_date_limits_whole_errata, + self._query_get_package_ids_by_rhndate_limits_whole_errata, + self._query_get_package_ids) + else: + return self._get_ids(self._query_get_package_ids_by_date_limits, self._query_get_package_ids_by_rhndate_limits, self._query_get_package_ids)

1 0

Changes to 'refs/tags/spacecmd-1.8.4-1'
by aparsons 15 Apr '12

15 Apr '12

Tag 'spacecmd-1.8.4-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2012-04-14 23:33 +0000 Tagging package [spacecmd] version [1.8.4-1] in directory [spacecmd/]. Changes since spacewalk-java-1.8.45-1: Aron Parsons (3): spacecmd: cosmetics spacecmd: pretty-print JSON output Automatic commit of package [spacecmd] release [1.8.4-1]. --- rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 6 +++++- spacecmd/src/lib/utils.py | 9 ++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) ---

1 0

3 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons 15 Apr '12

15 Apr '12

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 6 +++++- spacecmd/src/lib/utils.py | 9 ++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) New commits: commit e2d83a06c82924faa9b30d017556ec5c3c57dfb5 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Sat Apr 14 19:33:37 2012 -0400 Automatic commit of package [spacecmd] release [1.8.4-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 308f552..f4b3713 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -1.8.3-1 spacecmd/ +1.8.4-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index dbdf696..3fc967b 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -61,6 +61,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Sat Apr 14 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.4-1 +- spacecmd: pretty-print JSON output +- spacecmd: cosmetics + * Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.3-1 - 809905 - add option to allow templating for spacecmd kickstarting (sherr(a)redhat.com) commit b75c6fa85f7fb417b4b8e60eeb2bb27da6f72840 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Sat Apr 14 19:25:47 2012 -0400 spacecmd: pretty-print JSON output diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py index 93fc1b5..628d9f2 100644 --- a/spacecmd/src/lib/utils.py +++ b/spacecmd/src/lib/utils.py @@ -596,12 +596,12 @@ def parse_api_args(args, sep=','): return ret -def json_dump(obj, fp, indent=2, **kwargs): +def json_dump(obj, fp, indent = 4, **kwargs): json.dump(obj, fp, ensure_ascii=False, indent=indent, **kwargs) -def json_dump_to_file(obj, filename, indent = 2): - json_data = json.dumps(obj, indent) +def json_dump_to_file(obj, filename): + json_data = json.dumps(obj, indent = 4, sort_keys = True) if json_data == None: logging.error("Could not generate json data object!" % k) commit 996d5e797b424e2b2da4ea854abebdd4c9030cf4 Author: Aron Parsons <aronparsons(a)gmail.com> Date: Sat Apr 14 19:19:34 2012 -0400 spacecmd: cosmetics diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py index 66ec32c..93fc1b5 100644 --- a/spacecmd/src/lib/utils.py +++ b/spacecmd/src/lib/utils.py @@ -599,12 +599,14 @@ def parse_api_args(args, sep=','): def json_dump(obj, fp, indent=2, **kwargs): json.dump(obj, fp, ensure_ascii=False, indent=indent, **kwargs) -def json_dump_to_file(obj, filename, indent = 2): +def json_dump_to_file(obj, filename, indent = 2): json_data = json.dumps(obj, indent) + if json_data == None: logging.error("Could not generate json data object!" % k) return False + try: fd = open(filename, 'w') fd.write(json_data) @@ -617,6 +619,7 @@ def json_dump_to_file(obj, filename, indent = 2): return True + def json_read_from_file(filename): try: data = open(filename).read()

1 0

Changes to 'refs/tags/spacewalk-java-1.8.45-1'
by Tomas Lestach 13 Apr '12

13 Apr '12

Tag 'spacewalk-java-1.8.45-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-13 15:53 +0000 Tagging package [spacewalk-java] version [1.8.45-1] in directory [java/]. Changes since spacewalk-backend-1.8.16-1: Tomas Lestach (2): 809579 - make system snapshot when changing server entitlements using API Automatic commit of package [spacewalk-java] release [1.8.45-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 17 ++++++++++ java/spacewalk-java.spec | 9 ++++- rel-eng/packages/spacewalk-java | 2 - 3 files changed, 26 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 13 Apr '12

13 Apr '12

java/spacewalk-java.spec | 9 ++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 38006c3a231db4e730ccaa104684cbd1624decb2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 17:53:08 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.45-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 958927a..4067f69 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.44 +Version: 1.8.45 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,13 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Apr 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.45-1 +- 809579 - make system snapshot when changing server entitlements using API + (tlestach(a)redhat.com) +- 812053 - change the condition (tlestach(a)redhat.com) +- print extra stack trace (tlestach(a)redhat.com) +- 804665 - do not scrub search_string (tlestach(a)redhat.com) + * Fri Apr 13 2012 Jan Pazdziora 1.8.44-1 - Fixing checkstyle. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 97ecb6d..3a5bd77 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.44-1 java/ +1.8.45-1 java/

1 0

java/code
by Tomas Lestach 13 Apr '12

13 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 17 ++++++++++ 1 file changed, 17 insertions(+) New commits: commit ca2274492a75db66e05e99e8a83f3feac7cd5694 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 17:32:48 2012 +0200 809579 - make system snapshot when changing server entitlements using API system.addEntitlements system.removeEntitlements system.upgradeEntitlement diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index e64ee9f..3aabcad 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -296,6 +296,8 @@ public class SystemHandler extends BaseHandler { } SystemManager.entitleServer(server, entitlement); + SystemManager.snapshotServer(server, LocalizationService.getInstance() + .getMessage("snapshots.entitlements")); return 1; } @@ -3604,6 +3606,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype #return_int_success() */ public int addEntitlements(String sessionKey, Integer serverId, List entitlements) { + boolean needsSnapshot = false; User loggedInUser = getLoggedInUser(sessionKey); Server server = null; try { @@ -3656,6 +3659,7 @@ public class SystemHandler extends BaseHandler { if (SystemManager.canEntitleServer(server, ent)) { ValidatorResult vr = SystemManager.entitleServer(server, ent); + needsSnapshot = true; if (vr.getErrors().size() > 0) { throw new InvalidEntitlementException(); } @@ -3665,6 +3669,11 @@ public class SystemHandler extends BaseHandler { } } + if (needsSnapshot) { + SystemManager.snapshotServer(server, LocalizationService + .getInstance().getMessage("snapshots.entitlements")); + } + return 1; } @@ -3684,6 +3693,7 @@ public class SystemHandler extends BaseHandler { * @xmlrpc.returntype #return_int_success() */ public int removeEntitlements(String sessionKey, Integer serverId, List entitlements) { + boolean needsSnapshot = false; User loggedInUser = getLoggedInUser(sessionKey); Server server = null; try { @@ -3705,12 +3715,19 @@ public class SystemHandler extends BaseHandler { continue; } SystemManager.removeServerEntitlement(server.getId(), ent); + needsSnapshot = true; } // process base entitlements at the end if (!baseEnts.isEmpty()) { // means unentile the whole system SystemManager.removeAllServerEntitlements(server.getId()); + needsSnapshot = true; + } + + if (needsSnapshot) { + SystemManager.snapshotServer(server, LocalizationService + .getInstance().getMessage("snapshots.entitlements")); } return 1;

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.16-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-backend-1.8.16-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 14:44 +0000 Tagging package [spacewalk-backend] version [1.8.16-1] in directory [backend/]. Changes since spacewalk-java-1.8.44-1: Jan Pazdziora (7): 812329 - The /etc/tnsnames.ora file might not exists. 812329 - add sudoers.d to the debug, there can be important information there. 812329 - the key variables are not used at all -- just print out everything we got. 812329 - make rhn-charsets working on PostgreSQL as well; the output format changed even for Oracle. 812329 - updating rhn-charsets man page -- update list of value names, no command line options. 812329 - adding PostgreSQL configuration and log files to the debug. Automatic commit of package [spacewalk-backend] release [1.8.16-1]. Shannon Hughes (1): 811990 - refresh proxy auth cache for hostname changes Stephen Herr (1): Broken link patch submitted on behalf of Michael Calmer Tomas Lestach (3): 804665 - do not scrub search_string print extra stack trace 812053 - change the condition --- backend/satellite_tools/rhn-charsets | 108 +--------- backend/satellite_tools/rhn-charsets.sgml | 29 -- backend/satellite_tools/spacewalk-debug | 18 + backend/spacewalk-backend.spec | 12 + java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 1 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2 java/code/webapp/WEB-INF/struts-config.xml | 2 proxy/proxy/rhnProxyAuth.py | 3 rel-eng/packages/spacewalk-backend | 2 web/html/network/systems/system_list | 4 10 files changed, 48 insertions(+), 133 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/spacewalk-backend.spec | 12 +++++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit dc0e16ed1ea09b41b89c71dafaa135de95cbdd15 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 16:44:23 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.16-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 4733b41..b7cf687 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.15 +Version: 1.8.16 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -673,6 +673,16 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.16-1 +- 812329 - adding PostgreSQL configuration and log files to the debug. +- 812329 - updating rhn-charsets man page -- update list of value names, no + command line options. +- 812329 - make rhn-charsets working on PostgreSQL as well; the output format + changed even for Oracle. +- 812329 - add sudoers.d to the debug, there can be important information + there. +- 812329 - The /etc/tnsnames.ora file might not exists. + * Fri Apr 13 2012 Jan Pazdziora 1.8.15-1 - With cobbler 2.2 landing in EPEL 5, we need to move to mod_wsgi with Spacewalk backend even on RHEL 5. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index ad669af..f0d55a8 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.15-1 backend/ +1.8.16-1 backend/

1 0

2 commits - backend/satellite_tools
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/satellite_tools/rhn-charsets.sgml | 29 ++--------------------------- backend/satellite_tools/spacewalk-debug | 8 ++++++++ 2 files changed, 10 insertions(+), 27 deletions(-) New commits: commit 42e75e6b97782cb6f31d096f99d48a0fccd8b712 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 16:31:03 2012 +0200 812329 - adding PostgreSQL configuration and log files to the debug. diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug index 506fba0..733ad99 100755 --- a/backend/satellite_tools/spacewalk-debug +++ b/backend/satellite_tools/spacewalk-debug @@ -221,6 +221,14 @@ fi ls /rhnsat/admin/rhnsat/bdump/*.trc 2>/dev/null | xargs -I file cp -fa file $DIR/database ls /rhnsat/admin/rhnsat/logs/*.log 2>/dev/null | xargs -I file cp -fa file $DIR/database +# PostgreSQL logs +if [ -f /var/lib/pgsql/pgstartup.log ] ; then + echo " * copying pgstartup.log" + cp -fa /var/lib/pgsql/pgstartup.log $DIR/database +fi + +ls /var/lib/pgsql/data/*.conf /var/lib/pgsql/data/pg_log/* 2>/dev/null | xargs -I file cp -fa file $DIR/database + if [ -d /var/log/spacewalk/schema-upgrade ] ; then echo " * copying schema upgrade logs" mkdir -p $DIR/schema-upgrade-logs commit 6fa6ed4adf1e47b205f54c9ab94c87179166d5ec Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 16:30:02 2012 +0200 812329 - updating rhn-charsets man page -- update list of value names, no command line options. diff --git a/backend/satellite_tools/rhn-charsets.sgml b/backend/satellite_tools/rhn-charsets.sgml index b8989e0..5fd5853 100644 --- a/backend/satellite_tools/rhn-charsets.sgml +++ b/backend/satellite_tools/rhn-charsets.sgml @@ -21,13 +21,6 @@ Fetch the database characterset types for an &RHNSAT;. <Synopsis> <cmdsynopsis> <command>&COMMAND;</command> - <arg>options <replaceable>...</replaceable></arg> - </cmdsynopsis> - <cmdsynopsis> - <arg>--db <replaceable>USERNAME/PASSWORD@SID</replaceable></arg> - </cmdsynopsis> - <cmdsynopsis> - <arg>-h</arg> <arg>--help</arg> </cmdsynopsis> </Synopsis> </RefSynopsisDiv> @@ -35,30 +28,12 @@ Fetch the database characterset types for an &RHNSAT;. <RefSect1><Title>Description</Title> <para> <emphasis>&COMMAND;</emphasis> fetches the database characterset - ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET') values for an &RHNSAT;. By - default it uses the database connection string found in /etc/rhn/rhn.conf. + ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET', 'server_encoding', 'client_encoding') + values for an &RHNSAT;. It uses the database connection string found in /etc/rhn/rhn.conf. </para> </RefSect1> -<RefSect1><Title>Options</Title> -<variablelist> - <varlistentry> - <term>-h, --help</term> - <listitem> - <para>Display the help screen with a list of options.</para> - </listitem> - </varlistentry> - <varlistentry> - <term>--db <replaceable>USERNAME/PASSWORD@SID</replaceable></term> - <listitem> - <para>alternative database string. Default value is the DEFAULT_DB - setting in /etc/rhn/rhn.conf</para> - </listitem> - </varlistentry> -</variablelist> -</RefSect1> - <RefSect1><Title>Files</Title> <simplelist> <member>/etc/rhn/rhn.conf</member>

1 0

web/html
by StephenHerr 13 Apr '12

13 Apr '12

web/html/network/systems/system_list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit df622ac01f986a611d6ce26d00796d2eec7bc415 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Apr 13 10:35:55 2012 -0400 Broken link patch submitted on behalf of Michael Calmer diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list index 2e36da1..368cb9f 100644 --- a/web/html/network/systems/system_list +++ b/web/html/network/systems/system_list @@ -30,10 +30,10 @@ </rhn-require> <column name="Errata" label="total_errata" align="center" width="5%"> - <url>/network/systems/details/errata_list.pxt?sid={column:id}</url> + <url>/rhn/systems/details/ErrataList.do?sid={column:id}</url> </column> <column name="Packages" label="outdated_packages" align="center" width="5%"> - <url>/network/systems/details/packages/upgrade.pxt?sid={column:id}</url> + <url>/rhn/systems/details/packages/UpgradableList.do?sid={column:id}</url> </column> <column name="System" label="server_name" sort_by="1" align="left" width="35%"> <url>/rhn/systems/details/Overview.do?sid={column:id}</url>

1 0

java/code
by Tomas Lestach 13 Apr '12

13 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c99e53de2509e76e2ec04c484ae318c4a8f81480 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 16:27:04 2012 +0200 812053 - change the condition 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 91afcb1..d2b6bc9 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 @@ -892,7 +892,7 @@ public class ErrataHandler extends BaseHandler { } //if calling cloneAsOriginal, do additional checks to verify a clone - if (inheritAllPackages) { + if (!inheritAllPackages) { if (!channel.isCloned()) { throw new InvalidChannelException("Cloned channel expected: " + channel.getLabel());

1 0

2 commits - backend/satellite_tools
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/satellite_tools/rhn-charsets | 108 +++-------------------------------- 1 file changed, 12 insertions(+), 96 deletions(-) New commits: commit 92e8e16447fdf58e4289b7769597c740680c5d9c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 16:19:29 2012 +0200 812329 - make rhn-charsets working on PostgreSQL as well; the output format changed even for Oracle. diff --git a/backend/satellite_tools/rhn-charsets b/backend/satellite_tools/rhn-charsets index 5ac13a4..d92e297 100755 --- a/backend/satellite_tools/rhn-charsets +++ b/backend/satellite_tools/rhn-charsets @@ -1,98 +1,13 @@ -#!/usr/bin/python -u -# -# Copyright (c) 2008--2011 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. -# - -import sys -try: - import os - from os.path import exists, join -except KeyboardInterrupt: - sys.stderr.write("\nUser interrupted process.\n") - sys.exit(0) - - -def errAndExit(errno, msg): - sys.stderr.write(msg+'\n') - sys.exit(errno) - - -# figure out import path -_LIBPATH = "" -for p in ["/var/www/rhns", "/usr/share/rhn"]: - if exists(p) and exists(join(p, 'server')) and exists(join(p, 'common')): - _LIBPATH = p -if _LIBPATH not in sys.path: - sys.path.append(_LIBPATH) - - -try: - from spacewalk.server import rhnSQL - from spacewalk.common.rhnConfig import initCFG -except KeyboardInterrupt: - sys.stderr.write("\nUser interrupted process.\n") - sys.exit(0) - - -def processCommandline(): - """ process the commandline """ - - from optparse import Option, OptionParser - optionsTable = [ - Option('--db', action='store', type="string", - help='alternative database string (USERNAME/PASSWORD@SID). '+\ - 'Default value is the DEFAULT_DB setting in '+\ - '/etc/rhn/rhn.conf'), - ] - - optionParser = OptionParser(option_list=optionsTable) - options, args = optionParser.parse_args() - - # we take no extra commandline arguments that are not linked to an option - if args: - msg = "ERROR: these arguments make no sense in this context (try "+\ - "--help): %s\n" % repr(args) - sys.stderr.write(msg) - sys.exit(-1) - - initCFG('server') - rhnSQL.initDB(options.db) - - return options - - -if __name__ == '__main__': - options = processCommandline() - - try: - h = rhnSQL.prepare(""" - SELECT parameter, value - FROM nls_database_parameters - WHERE parameter = 'NLS_CHARACTERSET' - OR parameter = 'NLS_NCHAR_CHARACTERSET' - """) - h.execute() - while True: - row = h.fetchone_dict() - if not row: - break - print '%s: %s' % (row['parameter'], repr(row['value'])) - except KeyboardInterrupt: - sys.stderr.write("\nUser interrupted process.\n") - sys.exit(0) - except (rhnSQL.SQLError, rhnSQL.SQLSchemaError, rhnSQL.SQLConnectError), e: - # really a stub for better exception handling in the future. - sys.stderr.write("SQL error occurred, traceback follows...\n") - raise +#!/bin/bash + +BACKEND=$( spacewalk-cfg-get db_backend ) + +if [ $BACKEND == 'oracle' ]; then + echo "SELECT parameter, value from nls_database_parameters where parameter in ( 'NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET' );" | spacewalk-sql --select-mode - +elif [ $BACKEND == 'postgresql' ]; then + echo 'show server_encoding; show client_encoding;' | spacewalk-sql --select-mode - +else + echo "Unknown database backend [$BACKEND]" + exit 1 +fi commit 59cbf20acde9699a7a6c2e9c2c24ace5484d7f91 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 16:04:44 2012 +0200 812329 - the key variables are not used at all -- just print out everything we got. diff --git a/backend/satellite_tools/rhn-charsets b/backend/satellite_tools/rhn-charsets index 065d147..5ac13a4 100755 --- a/backend/satellite_tools/rhn-charsets +++ b/backend/satellite_tools/rhn-charsets @@ -83,10 +83,11 @@ if __name__ == '__main__': OR parameter = 'NLS_NCHAR_CHARACTERSET' """) h.execute() - for key in ('NLS_CHARACTERSET', 'NLS_NCHAR_CHARACTERSET'): + while True: row = h.fetchone_dict() - if row: - print '%s: %s' % (row['parameter'], repr(row['value'])) + if not row: + break + print '%s: %s' % (row['parameter'], repr(row['value'])) except KeyboardInterrupt: sys.stderr.write("\nUser interrupted process.\n") sys.exit(0)

1 0

java/code
by Tomas Lestach 13 Apr '12

13 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java | 1 + 1 file changed, 1 insertion(+) New commits: commit f4dd7ee357ce2d02e118e3f996439a906fb181b1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 15:51:33 2012 +0200 print extra stack trace sometimes there're exceptions within exceptions we do not see, so adding extra trace diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java index 2b4f248..2c61e19 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/XmlRpcServlet.java @@ -185,6 +185,7 @@ public class XmlRpcServlet extends HttpServlet { // By the time we get here, it can't be a FaultException, so just // wrap it in a ServletException and toss. ServletException e = new ServletException("Throwable from XmlRpc", t); + t.printStackTrace(); e.initCause(t); throw e; }

1 0

2 commits - backend/satellite_tools
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/satellite_tools/spacewalk-debug | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 32041195b357640ca763cdc6fb49ad94bd1d5032 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 15:44:36 2012 +0200 812329 - add sudoers.d to the debug, there can be important information there. diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug index 786bb6d..506fba0 100755 --- a/backend/satellite_tools/spacewalk-debug +++ b/backend/satellite_tools/spacewalk-debug @@ -175,9 +175,9 @@ if [ -d /root/ssl-build ] ; then fi # /etc/sudoers -if [ -f /etc/sudoers ] ; then - echo " * copying /etc/sudoers" - cp -fa /etc/sudoers $DIR/conf +if [ -f /etc/sudoers -o -d /etc/sudoers.d ] ; then + echo " * copying /etc/sudoers*" + cp -faRd /etc/sudoers* $DIR/conf fi # /etc/passwd commit 034b2b11438c39d70effbf54a9a6ccb0894123c6 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 15:38:11 2012 +0200 812329 - The /etc/tnsnames.ora file might not exists. Addressing # spacewalk-debug Collecting and packaging relevant diagnostic information. Warning: this may take some time... * copying configuration information cp: cannot stat `/etc/tnsnames.ora': No such file or directory diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug index 07d210a..786bb6d 100755 --- a/backend/satellite_tools/spacewalk-debug +++ b/backend/satellite_tools/spacewalk-debug @@ -97,7 +97,9 @@ echo " * copying configuration information" cp -fapRd /etc/httpd/conf* $DIR/conf/httpd cp -fapRd /etc/rhn $DIR/conf/rhn cp -fapRd /etc/sysconfig/rhn $DIR/conf/rhn/sysconfig -cp -fapRd /etc/tnsnames.ora $DIR/conf +if [ -f /etc/tnsnames.ora ] ; then + cp -fad /etc/tnsnames.ora $DIR/conf +fi echo " * copying logs" cp -fapRd /var/log/httpd $DIR/httpd-logs

1 0

java/code
by Tomas Lestach 13 Apr '12

13 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 2 ++ 1 file changed, 2 insertions(+) New commits: commit bcc055b02eb13c7ac5d38cdb7a2b5f1be52df8db Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 13 12:14:27 2012 +0200 804665 - do not scrub search_string diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 2c79bb3..591c766 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -313,6 +313,8 @@ <form-property name="invert" type="java.lang.Boolean" /> <form-property name="fineGrained" type="java.lang.Boolean" /> <form-property name="submitted" type="java.lang.Boolean" /> + <form-property name="no_scrub" type="java.lang.String" + initial="search_string"/> </form-bean> <form-bean name="docsSearchForm"

1 0

proxy/proxy
by Shannon Hughes 13 Apr '12

13 Apr '12

proxy/proxy/rhnProxyAuth.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 57598ac46fbf15c744d5de4849b8e42569bf4f40 Author: Shannon Hughes <shughes(a)redhat.com> Date: Fri Apr 13 08:48:06 2012 -0400 811990 - refresh proxy auth cache for hostname changes Worked with msuchy to get this patch into spacewalk. Patch changes the cache key to include hostname so when the incoming apache request has a different hostname in the url, the cache will now consider the hostname and update cache when hostnames differ. Tested using a dual chained proxy attached to a Satellite: Client -> Proxy A -> Proxy B -> Satellite Ran elinks testing kickstart file generations with proxy A ip hostname and proxy A canonical hostname Ran kickstart installs Ran yum updates on packages diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py index 85ba60e..b26370b 100644 --- a/proxy/proxy/rhnProxyAuth.py +++ b/proxy/proxy/rhnProxyAuth.py @@ -22,6 +22,7 @@ import time import socket import xmlrpclib import sys +from hashlib import sha1 ## local imports import rhnAuthCacheClient @@ -364,7 +365,7 @@ problems, isn't running, or the token is somehow corrupt. return serverObj def __cache_proxy_key(self): - return 'p' + str(self.__serverid) + return 'p' + str(self.__serverid) + sha1(self.hostname).hexdigest() def getProxyServerId(self): return self.__serverid

1 0

Changes to 'refs/tags/spacewalk-java-1.8.44-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-java-1.8.44-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 12:21 +0000 Tagging package [spacewalk-java] version [1.8.44-1] in directory [java/]. Changes since spacewalk-utils-1.8.5-1: Jan Pazdziora (2): Fixing checkstyle. Automatic commit of package [spacewalk-java] release [1.8.44-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 5 ++--- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 13 Apr '12

13 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit e08c0a11e5d7dcfb5f5c8bd6541383b38fd23e9c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 14:21:50 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.44-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index faba64d..958927a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.43 +Version: 1.8.44 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.44-1 +- Fixing checkstyle. + * Fri Apr 13 2012 Jan Pazdziora 1.8.43-1 - fix KickstartWizardCommandTest (tlestach(a)redhat.com) - 812053 - making errata.clone api not requires cloned channels diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 13c1546..97ecb6d 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.43-1 java/ +1.8.44-1 java/

1 0

java/code
by Jan Pazdziora 13 Apr '12

13 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit ab89258e53a12bf0f455cf870c34af77866a6b45 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 14:21:17 2012 +0200 Fixing checkstyle. Addressing Starting audit... ./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:895:11: 'if' is not followed by whitespace. ./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:895:31: '{' is not preceded with whitespace. ./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:902: Line has trailing spaces. ./code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java:912: Line has trailing spaces. Audit done. 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 723fd0a..91afcb1 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 @@ -892,14 +892,14 @@ public class ErrataHandler extends BaseHandler { } //if calling cloneAsOriginal, do additional checks to verify a clone - if(inheritAllPackages){ + if (inheritAllPackages) { if (!channel.isCloned()) { throw new InvalidChannelException("Cloned channel expected: " + channel.getLabel()); } Channel original = ChannelFactory.lookupOriginalChannel(channel); - + if (original == null) { throw new InvalidChannelException("Cannot access original " + "of the channel: " + channel.getLabel()); @@ -909,7 +909,6 @@ public class ErrataHandler extends BaseHandler { throw new LookupException("User " + loggedInUser.getLogin() + " does not have access to channel " + original.getLabel()); } - }

1 0

Changes to 'refs/tags/spacewalk-utils-1.8.5-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-utils-1.8.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 11:51 +0000 Tagging package [spacewalk-utils] version [1.8.5-1] in directory [utils/]. Changes since spacewalk-java-1.8.43-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-utils] release [1.8.5-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages utils/spacewalk-utils.spec
by Jan Pazdziora 13 Apr '12

13 Apr '12

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 732557f6b7247ab5718448087f7730853e689e20 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 13:51:08 2012 +0200 Automatic commit of package [spacewalk-utils] release [1.8.5-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 7c96353..7dfb5b6 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.8.4-1 utils/ +1.8.5-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 473cbaf..63cc902 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.5-1 +- 810313 - new option to list snapshot details (mzazrivec(a)redhat.com) + * Thu Apr 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1 - made new pylint on Fedora 16 happy

1 0

Changes to 'refs/tags/spacewalk-java-1.8.43-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-java-1.8.43-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 11:50 +0000 Tagging package [spacewalk-java] version [1.8.43-1] in directory [java/]. Changes since spacewalk-schema-1.8.15-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-java] release [1.8.43-1]. --- java/spacewalk-java.spec | 13 ++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 13 Apr '12

13 Apr '12

java/spacewalk-java.spec | 13 ++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) New commits: commit c8db23ad6ccd5cbd5ad0381dc9047ce1b90a5163 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 13:50:48 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.43-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index c6e2a57..faba64d 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.42 +Version: 1.8.43 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,17 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.43-1 +- fix KickstartWizardCommandTest (tlestach(a)redhat.com) +- 812053 - making errata.clone api not requires cloned channels + (jsherril(a)redhat.com) +- 811470 - fix documentation for getRepoSyncCronExpression API + (mzazrivec(a)redhat.com) +- 811470 - make the documentation for createOrUpdateSymlink more clear + (mzazrivec(a)redhat.com) +- 811470 - fix documentation for ChannelSerializer (mzazrivec(a)redhat.com) +- replace \r\n with \n for CustomDataValues (tlestach(a)redhat.com) + * Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.42-1 - 698940 - Activation Key does not have to have a base channel to add Child Channels (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 270a203..13c1546 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.42-1 java/ +1.8.43-1 java/

1 0

Changes to 'refs/tags/spacewalk-schema-1.8.15-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-schema-1.8.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 11:50 +0000 Tagging package [spacewalk-schema] version [1.8.15-1] in directory [schema/spacewalk/]. Changes since spacewalk-backend-1.8.15-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-schema] release [1.8.15-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Jan Pazdziora 13 Apr '12

13 Apr '12

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 38265f04f00fc027c10f88a647b61bb110133a1b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 13:50:22 2012 +0200 Automatic commit of package [spacewalk-schema] release [1.8.15-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index c78aa3f..4f54695 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.8.14-1 schema/spacewalk/ +1.8.15-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 86449c8..842cb92 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.8.14 +Version: 1.8.15 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.15-1 +- 787225 - the Log Size actually checks Log Size Growth. +- fix PG lookup_transaction_package stored procedure (tlestach(a)redhat.com) + * Tue Apr 03 2012 Jan Pazdziora 1.8.14-1 - fix procedure dependencies (mzazrivec(a)redhat.com)

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.15-1'
by Jan Pazdziora 13 Apr '12

13 Apr '12

Tag 'spacewalk-backend-1.8.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-13 09:54 +0000 Tagging package [spacewalk-backend] version [1.8.15-1] in directory [backend/]. Changes since spacewalk-web-1.8.9-1: Jan Pazdziora (2): With cobbler 2.2 landing in EPEL 5, we need to move to mod_wsgi with Spacewalk backend even on RHEL 5. Automatic commit of package [spacewalk-backend] release [1.8.15-1]. Justin Sherrill (1): 812053 - making errata.clone api not requires cloned channels Tomas Lestach (1): fix KickstartWizardCommandTest --- backend/spacewalk-backend.spec | 23 +------ java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 32 +++++----- java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java | 2 rel-eng/packages/spacewalk-backend | 2 4 files changed, 26 insertions(+), 33 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 455d01b5809c2850a7308ef41a0b23b26ca9f136 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 11:54:17 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.15-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2358077..4733b41 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.14 +Version: 1.8.15 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -673,6 +673,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Apr 13 2012 Jan Pazdziora 1.8.15-1 +- With cobbler 2.2 landing in EPEL 5, we need to move to mod_wsgi with + Spacewalk backend even on RHEL 5. + * Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.14-1 - 786705 - Update config default to preserve base channel on reactivation (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 4212cf3..ad669af 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.14-1 backend/ +1.8.15-1 backend/

1 0

backend/spacewalk-backend.spec
by Jan Pazdziora 13 Apr '12

13 Apr '12

backend/spacewalk-backend.spec | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) New commits: commit 7e7129fe35d0bd0e762a947eddb3e761797466bc Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 13 10:50:29 2012 +0200 With cobbler 2.2 landing in EPEL 5, we need to move to mod_wsgi with Spacewalk backend even on RHEL 5. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index f5148dd..2358077 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -97,11 +97,7 @@ Conflicts: python-sgmlop # cobbler-web is known to break our configuration Conflicts: cobbler-web -%if 0%{?rhel} && 0%{?rhel} < 6 -Requires: mod_python -%else Requires: mod_wsgi -%endif %description server @@ -255,7 +251,7 @@ Requires: python-hashlib Requires: PyXML Requires: mod_ssl Requires: %{name}-xml-export-libs -Requires: cobbler >= 1.4.3 +Requires: cobbler >= 2.2.1 Requires: rhnlib >= 2.5.38 Obsoletes: rhns-satellite-tools < 5.3.0 Obsoletes: spacewalk-backend-satellite-tools <= 0.2.7 @@ -290,12 +286,7 @@ make -f Makefile.backend install PREFIX=$RPM_BUILD_ROOT \ export PYTHON_MODULE_NAME=%{name} export PYTHON_MODULE_VERSION=%{version} -%if 0%{?rhel} && 0%{?rhel} < 6 -rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-wsgi.conf -rm -rfv $RPM_BUILD_ROOT/%{rhnroot}/wsgi -%else rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf -%endif %find_lang %{name}-server @@ -368,12 +359,10 @@ rm -f %{rhnconf}/rhnSecret.py* %attr(755,root,root) %{_bindir}/spacewalk-cfg-get %{_mandir}/man8/spacewalk-cfg-get.8.gz # wsgi stuff -%if !( 0%{?rhel} && 0%{?rhel} < 6) %dir %{rhnroot}/wsgi %{rhnroot}/wsgi/__init__.py* %{rhnroot}/wsgi/wsgiHandler.py* %{rhnroot}/wsgi/wsgiRequest.py* -%endif %files sql %defattr(-,root,root) @@ -462,9 +451,6 @@ rm -f %{rhnconf}/rhnSecret.py* # main httpd config %attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server.conf -%if 0%{?rhel} && 0%{?rhel} < 6 -%attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server-python.conf -%else # wsgi stuff %attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf %{rhnroot}/wsgi/app.py* @@ -476,7 +462,6 @@ rm -f %{rhnconf}/rhnSecret.py* %{rhnroot}/wsgi/sat_dump.py* %{rhnroot}/wsgi/xmlrpc.py* %{rhnroot}/wsgi/xp.py* -%endif # logs and other stuff %config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-server

1 0

java/code
by Tomas Lestach 12 Apr '12

12 Apr '12

java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee01c31ffb0a859553b8f9e315e8e1996a3e45ba Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 12 17:17:07 2012 +0200 fix KickstartWizardCommandTest diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java index f823acd..6d531cf 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java @@ -41,7 +41,7 @@ public class KickstartWizardCommandTest extends BaseTestCaseWithUser { Channel c = ChannelFactoryTest.createBaseChannel(user); assertNull(c.getParentChannel()); - assertNull(c.getOrg()); + assertNotNull(c.getOrg()); KickstartableTree tree = KickstartableTreeTest.createTestKickstartableTree(c); tree.setChannel(c); TestUtils.saveAndFlush(tree);

1 0

java/code
by Justin Sherrill 12 Apr '12

12 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 32 +++++----- 1 file changed, 18 insertions(+), 14 deletions(-) New commits: commit 44ae2fc89e9ac27f5548d25b4d848ab3b9a31b4e Author: Justin Sherrill <jsherril(a)redhat.com> Date: Thu Apr 12 11:52:24 2012 -0400 812053 - making errata.clone api not requires cloned channels 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 6da34c3..723fd0a 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 @@ -891,23 +891,27 @@ public class ErrataHandler extends BaseHandler { throw new NoSuchChannelException(); } - if (!channel.isCloned()) { - throw new InvalidChannelException("Cloned channel expected: " + + //if calling cloneAsOriginal, do additional checks to verify a clone + if(inheritAllPackages){ + if (!channel.isCloned()) { + throw new InvalidChannelException("Cloned channel expected: " + channel.getLabel()); - } - - Channel original = ChannelFactory.lookupOriginalChannel(channel); + } - if (original == null) { - throw new InvalidChannelException("Cannot access original " + - "of the channel: " + channel.getLabel()); + Channel original = ChannelFactory.lookupOriginalChannel(channel); + + if (original == null) { + throw new InvalidChannelException("Cannot access original " + + "of the channel: " + channel.getLabel()); + } + // check access to the original + if (ChannelFactory.lookupByIdAndUser(original.getId(), loggedInUser) == null) { + throw new LookupException("User " + loggedInUser.getLogin() + + " does not have access to channel " + original.getLabel()); + } + } - // check access to the original - if (ChannelFactory.lookupByIdAndUser(original.getId(), loggedInUser) == null) { - throw new LookupException("User " + loggedInUser.getLogin() + - " does not have access to channel " + original.getLabel()); - } if (!UserManager.verifyChannelAdmin(loggedInUser, channel)) { throw new PermissionCheckFailureException(); @@ -943,7 +947,7 @@ public class ErrataHandler extends BaseHandler { //Now publish them all to the channel in a single shot List<Errata> published = ErrataFactory.publishToChannel(errataToPublish, channel, - loggedInUser, true); + loggedInUser, inheritAllPackages); for (Errata e : published) { ErrataFactory.save(e); }

1 0

Changes to 'refs/tags/spacewalk-web-1.8.9-1'
by StephenHerr 12 Apr '12

12 Apr '12

Tag 'spacewalk-web-1.8.9-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-12 15:18 +0000 Tagging package [spacewalk-web] version [1.8.9-1] in directory [web/]. Changes since spacewalk-java-1.8.42-1: Milan Zazrivec (3): 811470 - fix documentation for ChannelSerializer 811470 - make the documentation for createOrUpdateSymlink more clear 811470 - fix documentation for getRepoSyncCronExpression API Stephen Herr (2): 812031 - Update perl channel-select-dropdowns to use the same hierarchical sort as java pages Automatic commit of package [spacewalk-web] release [1.8.9-1]. Tomas Lestach (1): replace \r\n with \n for CustomDataValues --- java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java | 3 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 6 - java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 10 + rel-eng/packages/spacewalk-web | 2 web/modules/rhn/RHN/DB/ChannelEditor.pm | 58 ++++++++++ web/modules/sniglets/Sniglets/ChannelEditor.pm | 51 +++++--- web/spacewalk-web.spec | 6 - 8 files changed, 110 insertions(+), 29 deletions(-) ---

1 0

2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by StephenHerr 12 Apr '12

12 Apr '12

rel-eng/packages/spacewalk-web | 2 web/modules/rhn/RHN/DB/ChannelEditor.pm | 58 +++++++++++++++++++++++++ web/modules/sniglets/Sniglets/ChannelEditor.pm | 51 +++++++++++++-------- web/spacewalk-web.spec | 6 ++ 4 files changed, 95 insertions(+), 22 deletions(-) New commits: commit d633fc581799a5ec1950cbc398d07edc6d81e61a Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 12 11:18:45 2012 -0400 Automatic commit of package [spacewalk-web] release [1.8.9-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index c1b7181..a29e1ae 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.8-1 web/ +1.8.9-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 9115ee2..e55d6a4 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.8 +Version: 1.8.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Thu Apr 12 2012 Stephen Herr <sherr(a)redhat.com> 1.8.9-1 +- 812031 - Update perl channel-select-dropdowns to use the same hierarchical + sort as java pages (sherr(a)redhat.com) + * Thu Apr 05 2012 Jan Pazdziora 1.8.8-1 - Fix naming of cloned errata to replace only the first 2 chars (tlestach(a)redhat.com) commit 893bc22592af1a354037335f9bc2559f09d1056a Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 12 11:18:32 2012 -0400 812031 - Update perl channel-select-dropdowns to use the same hierarchical sort as java pages diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm index 223c799..564e75e 100644 --- a/web/modules/rhn/RHN/DB/ChannelEditor.pm +++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm @@ -146,6 +146,64 @@ EOQ return @channels; } +sub base_channels_visible_to_org { + my $self = shift; + my $org_id = shift; + + my $dbh = RHN::DB->connect; + + my $query; + my $sth; + + $query = <<EOQ; +SELECT NAME, ID + FROM rhnChannel + WHERE (org_id = :org_id OR org_id is NULL) + AND parent_channel is NULL + ORDER BY name +EOQ + + $sth = $dbh->prepare($query); + $sth->execute_h(org_id => $org_id); + + my @channels; + + while (my $row = $sth->fetchrow_hashref) { + push @channels, $row; + } + + return @channels; +} + +sub child_channels_visible_to_org_from_base { + my $self = shift; + my $org_id = shift; + my $base_channel_id = shift; + + my $dbh = RHN::DB->connect; + + my $query; + my $sth; + + $query = <<EOQ; +SELECT NAME, ID + FROM rhnChannel + WHERE (org_id = :org_id OR org_id is NULL) + AND parent_channel = :parent_channel + ORDER BY name +EOQ + + $sth = $dbh->prepare($query); + $sth->execute_h(org_id => $org_id, parent_channel => $base_channel_id); + + my @channels; + + while (my $row = $sth->fetchrow_hashref) { + push @channels, $row; + } + + return @channels; +} sub channels_visible_to_org { my $self = shift; diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm index 912c194..8b0e9b7 100644 --- a/web/modules/sniglets/Sniglets/ChannelEditor.pm +++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm @@ -350,11 +350,31 @@ sub clone_channel_form { return $html; } +sub populate_channel_list { + my $org_id = shift; + + my @channel_list = (); + my @base_channel_list = RHN::ChannelEditor->base_channels_visible_to_org($org_id); + foreach my $base (@base_channel_list) { + push (@channel_list, { NAME => $base->{NAME}, + ID => $base->{ID}, + DEPTH => 1}); + my @child_channel_list = RHN::ChannelEditor->child_channels_visible_to_org_from_base($org_id, $base->{ID}); + foreach my $child (@child_channel_list) { + push (@channel_list, { NAME => $child->{NAME}, + ID => $child->{ID}, + DEPTH => 2}); + } + } + + return @channel_list +} + sub build_clone_channel_details_form { my $pxt = shift; my %attr = @_; - my @channel_list = RHN::ChannelEditor->channels_visible_to_org_with_parent($pxt->user->org_id); + my @channel_list = populate_channel_list($pxt->user->org_id); my $ds = new RHN::DataSource::Channel(-mode => 'user_subscribe_perms'); my $subscribable = $ds->execute_query(-u_id => $pxt->user->id, -org_id => $pxt->user->org_id); @@ -373,17 +393,7 @@ sub build_clone_channel_details_form { my $channel_selectbox = new RHN::Form::Widget::Select(name => 'Clone From', label => 'clone_from'); - my @my_channels = grep {$_->{CHANNEL_ORG_ID} and $_->{CHANNEL_ORG_ID} == $pxt->user->org_id} @channel_list; -## my @other_channels = grep { not ($_->{CHANNEL_ORG_ID} and $_->{CHANNEL_ORG_ID} == $pxt->user->org_id) } @channel_list; - ##bugzilla - my @other_channels = grep { not ($_->{CHANNEL_ORG_ID}) } @channel_list; - - my @options = ( { NAME => 'My Channels', ID => 'my_channels', DEPTH => 1, OPTGROUP => 1 }, - @my_channels, - { NAME => 'Other Channels', ID => 'other_channels', DEPTH => 1, OPTGROUP => 1 }, - @other_channels); - - foreach my $opt (@options) { + foreach my $opt (@channel_list) { $channel_selectbox->add_option( {value => $opt->{ID}, label => ( $opt->{DEPTH} == 1 ? $opt->{NAME} @@ -649,16 +659,17 @@ sub channel_select_options { @rh_channels); } elsif ($mode eq 'compare_channels') { - my @org_channels = RHN::Channel->channels_owned_by_org($pxt->user->org_id); - my @rh_channels = RHN::Channel->channels_owned_by_org('NULL'); + my @additional_channels_hash = populate_channel_list($pxt->user->org_id); + my @additional_channels = (); + foreach my $tmp_channel (@additional_channels_hash) { + push (@additional_channels, [$tmp_channel->{DEPTH} == 1 ? + $tmp_channel->{NAME} : '  ' . $tmp_channel->{NAME}, + 'channel_' . $tmp_channel->{ID}]); + } - @org_channels = grep { $perm_map{$_->[1]} } @org_channels; - @rh_channels = grep { $perm_map{$_->[1]} } @rh_channels; + @additional_channels = grep { $perm_map{$_->[1]} } @additional_channels; - push @channel_list, ([ 'My Channels', 'my_channels', 'optgroup' ], - @org_channels, - [ 'Red Hat Channels', 'redhat_channels', 'optgroup' ], - @rh_channels); + push @channel_list, (@additional_channels); } elsif ($mode eq 'errata_manager') { @channel_list = ([ 'All managed packages', 'any_channel' ]);

1 0

3 commits - java/code
by Milan Zazrivec 12 Apr '12

12 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 6 +++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3 ++- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ChannelSerializer.java | 10 ++++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) New commits: commit a5673cad3ee2c5c3da3a70ace1f10065260f4bc4 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Apr 12 12:30:18 2012 +0200 811470 - fix documentation for getRepoSyncCronExpression API 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 96e61d3..e66afd5 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 @@ -2700,15 +2700,15 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Returns repo synchronization cron expression + * Returns repo synchronization quartz expression * @param sessionKey session key * @param channelLabel channel label - * @return cron expression + * @return quartz expression * * @xmlrpc.doc Returns repo synchronization cron expression * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "channelLabel", "channel label") - * @xmlrpc.returntype string cron expression + * @xmlrpc.returntype string quartz expression */ public String getRepoSyncCronExpression(String sessionKey, String channelLabel) { User loggedInUser = getLoggedInUser(sessionKey); commit 8cbbe969cffedb92c2c7d9388b1468b5aa0fd382 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Apr 12 12:21:35 2012 +0200 811470 - make the documentation for createOrUpdateSymlink more clear diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 4be7f89..a435ee4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -458,7 +458,8 @@ public class ConfigChannelHandler extends BaseHandler { * #prop_desc("string","target_path", * "The target path for the symbolic link") * #prop_desc("string", "selinux_ctx", "SELinux Security context (optional)") - * #prop_desc("int", "revision", "next revision number, auto increment for null") + * #prop_desc("int", "revision", "next revision number, + * skip this field for automatic revision number assignment") * #struct_end() * @xmlrpc.returntype * $ConfigRevisionSerializer commit 885faab1b66a1da6d112326dfe360e897c11f611 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Apr 12 11:46:02 2012 +0200 811470 - fix documentation for ChannelSerializer 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 860d9cc..d4fdcaf 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 @@ -53,12 +53,18 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; * #prop("string", "gpg_key_url") * #prop("string", "gpg_key_id") * #prop("string", "gpg_key_fp") - * #prop("string", "yumrepo_source_url") - * #prop("string", "yumrepo_label") * #prop("dateTime.iso8601", "yumrepo_last_sync") * #prop("string", "end_of_life") * #prop("string", "parent_channel_label") * #prop("string", "clone_original") + * #array() + * #struct("contentSources") + * #prop("int", "id") + * #prop("string", "label") + * #prop("string", "sourceUrl") + * #prop("string", "type") + * #struct_end() + * #array_end() * #struct_end() * */

1 0

java/code
by Tomas Lestach 12 Apr '12

12 Apr '12

java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a8784398061e90f3477bc06151c0b4bb153d85fe Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 12 11:51:41 2012 +0200 replace \r\n with \n for CustomDataValues textarea returns \r\n as line breaks diff --git a/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java b/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java index a2022ce..f4ed7b8 100644 --- a/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java +++ b/java/code/src/com/redhat/rhn/domain/server/CustomDataValue.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.domain.server; +import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.action.server.ServerAction; import com.redhat.rhn.domain.org.CustomDataKey; import com.redhat.rhn.domain.user.User; @@ -120,7 +121,7 @@ public class CustomDataValue implements Serializable { * @param valueIn The value to set. */ public void setValue(String valueIn) { - this.value = valueIn; + this.value = StringUtil.webToLinux(valueIn); } /**

1 0

Changes to 'refs/tags/spacewalk-java-1.8.42-1'
by StephenHerr 11 Apr '12

11 Apr '12

Tag 'spacewalk-java-1.8.42-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-11 15:55 +0000 Tagging package [spacewalk-java] version [1.8.42-1] in directory [java/]. Changes since spacewalk-backend-1.8.14-1: Stephen Herr (2): 698940 - Activation Key does not have to have a base channel to add Child Channels Automatic commit of package [spacewalk-java] release [1.8.42-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 7 ------- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by StephenHerr 11 Apr '12

11 Apr '12

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 863c1d320170e75733fc8c054bd14576ed2e31c7 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 11 11:55:52 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.42-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 39d32cc..c6e2a57 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.41 +Version: 1.8.42 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.42-1 +- 698940 - Activation Key does not have to have a base channel to add Child + Channels (sherr(a)redhat.com) + * Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.41-1 - adding javadoc to public RhnPostMockStrutsTestCase method (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 87f21ca..270a203 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.41-1 java/ +1.8.42-1 java/

1 0

java/code
by StephenHerr 11 Apr '12

11 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 7 ------- 1 file changed, 7 deletions(-) New commits: commit 68f49fcff44f00c90ed0bb7639e4a93e656f37ef Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 11 11:23:37 2012 -0400 698940 - Activation Key does not have to have a base channel to add Child Channels diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java index 93eb3e1..e8ef194 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java @@ -480,13 +480,6 @@ public class ActivationKeyHandler extends BaseHandler { " is not a child channel."); } - // Verify we have access to the child's parent channel: - Channel parentChannel = childChannel.getParentChannel(); - if (!activationKey.getChannels().contains(parentChannel)) { - throw new InvalidChannelException("Key has not been assigned base " + - "channel for " + childChannel.getName()); - } - manager.addChannel(activationKey, childChannel); }

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.14-1'
by StephenHerr 11 Apr '12

11 Apr '12

Tag 'spacewalk-backend-1.8.14-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-11 13:52 +0000 Tagging package [spacewalk-backend] version [1.8.14-1] in directory [backend/]. Changes since spacewalk-java-1.8.41-1: Stephen Herr (2): 786705 - Update config default to preserve base channel on reactivation Automatic commit of package [spacewalk-backend] release [1.8.14-1]. --- backend/rhn-conf/rhn_server.conf | 2 +- backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---

1 0

2 commits - backend/rhn-conf backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr 11 Apr '12

11 Apr '12

backend/rhn-conf/rhn_server.conf | 2 +- backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 6ac346f4068e3110491999749ebef800eb862ce5 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 11 09:52:47 2012 -0400 Automatic commit of package [spacewalk-backend] release [1.8.14-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 62b82a5..f5148dd 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.13 +Version: 1.8.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Wed Apr 11 2012 Stephen Herr <sherr(a)redhat.com> 1.8.14-1 +- 786705 - Update config default to preserve base channel on reactivation + (sherr(a)redhat.com) + * Tue Apr 10 2012 Jan Pazdziora 1.8.13-1 - rhn-schema-stats: update manual page (mzazrivec(a)redhat.com) - rhn-schema-stats: support for PostgreSQL (mzazrivec(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 68d47e4..4212cf3 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.13-1 backend/ +1.8.14-1 backend/ commit af0c6d7a1697c6d21cff41d64c5b6f2bd73aceb0 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 11 09:52:12 2012 -0400 786705 - Update config default to preserve base channel on reactivation diff --git a/backend/rhn-conf/rhn_server.conf b/backend/rhn-conf/rhn_server.conf index 86fa72c..bfb599a 100644 --- a/backend/rhn-conf/rhn_server.conf +++ b/backend/rhn-conf/rhn_server.conf @@ -126,7 +126,7 @@ jabber_server = # base channel reset by default. # set to '0' if base channel needs to be preserved -reset_base_channel = 1 +reset_base_channel = 0 # location relative to mount point for yum repomd files repomd_path_prefix = rhn/repodata

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2012