client/tools/rhnpush/rhnpush.spec | 8 +++- java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 9 ---- java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java | 1 java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 17 +------- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 20 ++++++++-- java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 3 + java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 17 -------- rel-eng/packages/rhnpush | 2 - rel-eng/packages/spacewalk-repo | 2 - spec-tree/spacewalk-repo/spacewalk-repo.spec | 5 ++ 10 files changed, 34 insertions(+), 50 deletions(-)
New commits: commit 85968a8a8fd83234a75c5872ea110a5baa81f528 Merge: f9b426d... bea9453... Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Apr 1 10:09:46 2009 -0400
Merge branch 'vader'
commit bea9453378fbed4511a2d43bf7507d538bca6abf Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Apr 1 10:07:31 2009 -0400
Automatic commit of package [rhnpush] release [0.4.7-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index 2a49301..b37c129 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 0.4.6 +Version: 0.4.7 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/solaris2mpm.8*
%changelog +* Wed Apr 01 2009 Pradeep Kilambi pkilambi@redhat.com 0.4.7-1 +- new build for 485880 (pkilambi@redhat.com) + * Wed Apr 1 2009 Pradeep Kilambi pkilambi@redhat.com - Resolves: 485880 - missing help and man options for rhnpush - new build
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index db58155..e1e0f3a 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -0.4.6-1 client/tools/rhnpush/ +0.4.7-1 client/tools/rhnpush/
commit ff4d6e0115a6593bc8a910709292672a7cd11c50 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Apr 1 10:06:24 2009 -0400
new build for 485880
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index 2424c2a..2a49301 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/solaris2mpm.8*
%changelog +* Wed Apr 1 2009 Pradeep Kilambi pkilambi@redhat.com +- Resolves: 485880 - missing help and man options for rhnpush - new build + * Wed Mar 11 2009 jesus m. rodriguez jesusr@redhat.com 0.4.6-1 - 485880 - adding missing man page options to rhnpush - Fix tab in rhnpush.py.
commit cf74d0129af6493970fc715307eb0aab410dea8c Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Apr 1 10:03:36 2009 -0400
492903 - api - channel.software.create - updates so that new channels will show on Channel tab
Prior to the changes made with this commit, if a channel was created by the channel.software.create API, there was a possibility that the channel would not show up in the Channels tab. These changes will address this issue.
See BZ for more details.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml index 8fb577a..1d5c88c 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml @@ -170,13 +170,4 @@ AND sg.max_members > 0 </query> </callable-mode>
-<write-mode name="create_chan_family"> - <query params="org_id, name, label, url"> -INSERT INTO rhnChannelFamily - (id, name, label, org_id, product_url) - VALUES (rhn_channel_family_id_seq.nextval, :name, :label, :org_id, :url) - </query> -</write-mode> - - </datasource_modes> diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java index dd8a50a..29bde86 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java @@ -127,7 +127,6 @@ public class ChannelFamilyFactory extends HibernateFactory { updateFamilyPermissions(orgIn); //permission to use it. } - return cfam; }
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java index 21f4d61..1dc9647 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java +++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java @@ -16,7 +16,6 @@ package com.redhat.rhn.domain.channel;
import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; -import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.user.UserManager;
import java.util.Date; @@ -126,19 +125,9 @@ public class NewChannelHelper { }
//adopt the channel into the org's channelfamily - ChannelFamily family = ChannelFamilyFactory.lookupByOrg(user.getOrg()); - if (family == null) { - // In most scenarios, the channel family will not be null. Changes - // were made to ensure that the family is created at org creation (486018) - // as well as during satellite-sync (446289); however, there is still - // an edge case where a customer may have an earlier Satellite (e.g. 511) - // with a configuration that doesn't have a channel family created yet, - // they upgrade to the version that has these improvements (e.g. 530) and - // then attempt to clone a channel (e.g. using API). In that case, - // it is possible the family doesn't yet exist when this method is called. - OrgManager.createChannelFamily(user.getOrg()); - family = ChannelFamilyFactory.lookupByOrg(user.getOrg()); - } + ChannelFamily family = ChannelFamilyFactory.lookupOrCreatePrivateFamily( + user.getOrg()); + family.getChannels().add(cloned); cloned.setChannelFamily(family);
diff --git a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java index d99656a..8119683 100644 --- a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java +++ b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.org; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; +import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.org.Org; @@ -168,7 +169,7 @@ public class CreateOrgCommand { createCryptoKey.store(); }
- OrgManager.createChannelFamily(createdOrg); + ChannelFamilyFactory.lookupOrCreatePrivateFamily(createdOrg);
return null; } diff --git a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java index 244e2f6..4bfc858 100644 --- a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java @@ -23,7 +23,6 @@ import java.util.Map; import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; -import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.validator.ValidatorException; @@ -455,20 +454,4 @@ public class OrgManager extends BaseManager { } return dtos; } - - - /** - * Creates a channel family for a channel. Should only be used upon org creation - * @param org the org to create a channel family for. - */ - public static void createChannelFamily(Org org) { - WriteMode m = ModeFactory.getWriteMode("Org_queries", "create_chan_family"); - Map params = new HashMap(); - params.put("org_id", org.getId()); - params.put("label", "private-channel-family-" + org.getId()); - params.put("name", "Private Channel Family " + org.getId()); - params.put("url", "Org Creation"); - m.executeUpdate(params); - } - }
commit b56536d715922ac98eca9fcb77a428a4a976eb74 Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Apr 1 09:59:26 2009 -0400
492980 - api - errata.getDetails - add release, product and solution to return and clarify last_modified_date in docs
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 376c6d7..4589656 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 @@ -182,13 +182,18 @@ public class ErrataHandler extends BaseHandler { * #struct("erratum") * #prop("string", "issue_date") * #prop("string", "update_date") - * #prop("string", "last_modified_date") - * #prop("string", "description") + * #prop_desc("string", "last_modified_date", "This date is only included for + * published erratum and it represents the last time the erratum was + * modified.") * #prop("string", "synopsis") + * #prop("int", "release") + * #prop("string", "type") + * #prop("string", "product") * #prop("string", "topic") + * #prop("string", "description") * #prop("string", "references") * #prop("string", "notes") - * #prop("string", "type") + * #prop("string", "solution") * #struct_end() */ public Map getDetails(String sessionKey, String advisoryName) throws FaultException { @@ -200,7 +205,6 @@ public class ErrataHandler extends BaseHandler {
Map errataMap = new HashMap();
- if (errata.getIssueDate() != null) { errataMap.put("issue_date", LocalizationService.getInstance() @@ -214,6 +218,13 @@ public class ErrataHandler extends BaseHandler { if (errata.getLastModified() != null) { errataMap.put("last_modified_date", errata.getLastModified().toString()); } + if (errata.getAdvisoryRel() != null) { + errataMap.put("release", errata.getAdvisoryRel()); + } + errataMap.put("product", + StringUtils.defaultString(errata.getProduct())); + errataMap.put("solution", + StringUtils.defaultString(errata.getSolution())); errataMap.put("description", StringUtils.defaultString(errata.getDescription())); errataMap.put("synopsis", @@ -226,6 +237,7 @@ public class ErrataHandler extends BaseHandler { StringUtils.defaultString(errata.getNotes())); errataMap.put("type", StringUtils.defaultString(errata.getAdvisoryType())); +
return errataMap; }
commit 2bfe20fb4a29e661b8c41c1bc7bd7a747e44c6ec Author: jesus m. rodriguez jesusr@redhat.com Date: Wed Apr 1 09:09:00 2009 -0400
testfile2
diff --git a/testfile2 b/testfile2 new file mode 100644 index 0000000..7e30ae7 --- /dev/null +++ b/testfile2 @@ -0,0 +1 @@ +sigh
commit 841689e3ce88cb4038b5d149d36583b82a9a5e72 Author: jesus m. rodriguez jesusr@redhat.com Date: Tue Mar 31 22:45:59 2009 -0400
Automatic commit of package [spacewalk-repo] release [0.5.2-1].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo index 5e76f3d..39b451b 100644 --- a/rel-eng/packages/spacewalk-repo +++ b/rel-eng/packages/spacewalk-repo @@ -1 +1 @@ -0.5.1-1 spec-tree/spacewalk-repo/ +0.5.2-1 spec-tree/spacewalk-repo/ diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index a601b09..fd91fac 100644 --- a/spec-tree/spacewalk-repo/spacewalk-repo.spec +++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec @@ -1,6 +1,6 @@ Summary: Spacewalk packages yum repository configuration. Name: spacewalk-repo -Version: 0.5.1 +Version: 0.5.2 Release: 1%{?dist} License: GPL Group: Development @@ -25,15 +25,15 @@ mkdir -p $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# some sane default value -%define reposubdir RHEL/5 +%define reposubdir rhel/5Server # redefine on fedora -%{?fedora: %define reposubdir Fedora/%{fedora}} +%{?fedora: %define reposubdir fedora/%{fedora}}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO [spacewalk] name=Spacewalk -baseurl=http://spacewalk.redhat.com/yum/%%7Bversion%7D/%%7Breposubdir%7D/%5C$basearc... +baseurl=http://spacewalk.redhat.com/yum/%%7Bversion%7D/%%7Breposubdir%7D/%5C$basearc... gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk enabled=1 gpgcheck=1 @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%changelog -* Tue Mar 31 2009 jesus m. rodriguez jesusr@redhat.com 0.5.1-1 +* Tue Mar 31 2009 jesus m. rodriguez jesusr@redhat.com 0.5.2-1 - rebuilding for 0.5
* Thu Jan 15 2009 Jan Pazdziora 0.4-1
commit 0161331ab53da45e46ffdb87956fbf36353fc543 Author: jesus m. rodriguez jesusr@redhat.com Date: Tue Mar 31 22:35:54 2009 -0400
Automatic commit of package [spacewalk-repo] release [0.5.1-1].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo index 82c569f..5e76f3d 100644 --- a/rel-eng/packages/spacewalk-repo +++ b/rel-eng/packages/spacewalk-repo @@ -1 +1 @@ -0.6-1 spec-tree/spacewalk-repo/ +0.5.1-1 spec-tree/spacewalk-repo/ diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index cdbe947..a601b09 100644 --- a/spec-tree/spacewalk-repo/spacewalk-repo.spec +++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec @@ -1,6 +1,6 @@ Summary: Spacewalk packages yum repository configuration. Name: spacewalk-repo -Version: 0.6 +Version: 0.5.1 Release: 1%{?dist} License: GPL Group: Development @@ -47,11 +47,8 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%changelog -* Tue Mar 31 2009 jesus m. rodriguez jesusr@redhat.com 0.6-1
spacewalk-commits@lists.fedorahosted.org