spacewalk-commits April 2009

spacewalk-commits@lists.fedorahosted.org

21 participants
741 discussions

Branch 'schemasandbox' - schema/spacewalk schema/util
by Jeff Ortel 01 Apr '09

01 Apr '09

schema/spacewalk/common/tables/tables.deps | 4 ++-- schema/spacewalk/oracle/procs/procs.deps | 19 ++++--------------- schema/util/genmain.py | 12 +++++++----- 3 files changed, 13 insertions(+), 22 deletions(-) New commits: commit 407ee9c39b621dc3e2395475dcd13e2b98d6c099 Author: Jeff Ortel <jortel(a)redhat.com> Date: Wed Apr 1 15:12:53 2009 -0400 Tweak dep aliasing and fix circular references and dups in .deps diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps index b3aba1a..6623e18 100644 --- a/schema/spacewalk/common/tables/tables.deps +++ b/schema/spacewalk/common/tables/tables.deps @@ -79,11 +79,11 @@ rhnErrataBuglist :: rhnErrata rhnErrataBuglistTmp :: rhnErrataTmp rhnErrataCVE :: rhnErrata rhnCVE rhnErrataCVETmp :: rhnErrataTmp rhnCVE -rhnErrataFile :: rhnErrata rhnErrataFileType lookup_functions +rhnErrataFile :: rhnErrata rhnErrataFileType rhnErrataFileChannel :: rhnChannel rhnErrataFile rhnChannelErrata rhnErrataFilePackage :: rhnPackage rhnErrataFile rhnErrataPackage rhnErrataFilePackageSource :: rhnErrataFile rhnPackageSource rhnErrataPackage -rhnErrataFileTmp :: rhnErrataTmp rhnErrataFileType lookup_functions +rhnErrataFileTmp :: rhnErrataTmp rhnErrataFileType rhnErrataFileChannelTmp :: rhnErrataFileTmp rhnChannel rhnErrataFilePackageTmp :: rhnErrataFileTmp rhnChannel rhnErrataKeyword :: rhnErrata diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps index b1aa6b7..874bbc9 100644 --- a/schema/spacewalk/oracle/procs/procs.deps +++ b/schema/spacewalk/oracle/procs/procs.deps @@ -2,7 +2,7 @@ # Dependencies for objects in the procs directory # -path = . tables views packages data +path = . tables views packages class types data buildPackageSenseMap :: rhnPackageSenseMap create_first_org :: rhnUserGroupType rhnUserGroup @@ -52,7 +52,6 @@ entitle_order :: rhn_ep is_user_applicant :: rhnUserGroupType web_contact rhnUserGroup \ rhnUserGroupMembers lookup_arch_type :: rhnArchType_data rhn_exception.pks -lookup_cache_key :: rhnCacheKey rhnCache rhnCacheTimestamps lookup_channel_arch :: rhn_exception.pks rhnException_data rhnChannelArch \ rhnChannelArch_data lookup_client_capability :: rhnClientCapabilityName @@ -70,7 +69,7 @@ lookup_functions :: lookup_evr lookup_package_name \ lookup_source_name lookup_channel_arch \ lookup_server_arch lookup_package_arch \ lookup_package_capability \ - lookup_erratafile_type lookup_cache_key \ + lookup_erratafile_type \ lookup_snapshot_invalid_reason \ lookup_tag_name lookup_sg_type \ lookup_tag lookup_arch_type @@ -101,8 +100,8 @@ queue_errata :: rhnSNPErrataQueue queue_server :: rhnServerNeededPackageCache rhnTaskQueue \ rhnServerNeededPackageView rhnServer \ rhnServerNeededErrataCache rhnServerNeededView -rhn_cache_delete :: lookup_cache_key rhnCacheTimestamps rhnCache -rhn_cache_set :: rhnCacheKey rhnCache rhnCacheTimestamps +rhn_cache_delete :: rhnCacheTimestamps rhnCache +rhn_cache_set :: rhnCacheKey rhnCache rhnCacheTimestamps rhn_cache_update_accessed :: rhnCacheKey rhnCache rhnCacheTimestamps rhn_install_org_satellites :: rhn_command_queue_instances rhn_ll_netsaint \ @@ -118,13 +117,3 @@ rhn_synch_probe_state :: rhn_probe_state rhn_deployed_probe \ set_ks_session_history_message :: rhnKickstartSessionState \ rhnKickstartSessionHistory truncateCacheQueue :: rhnOrgErrataCacheQueue -lookup_functions :: lookup_evr lookup_package_name \ - lookup_package_nevra \ - lookup_source_name lookup_channel_arch \ - lookup_server_arch lookup_package_arch \ - lookup_package_capability \ - lookup_erratafile_type lookup_cache_key \ - lookup_snapshot_invalid_reason \ - lookup_tag_name lookup_sg_type \ - lookup_tag lookup_arch_type - diff --git a/schema/util/genmain.py b/schema/util/genmain.py index 6feda58..8cc8150 100755 --- a/schema/util/genmain.py +++ b/schema/util/genmain.py @@ -178,19 +178,21 @@ class DepTab: return result def expand(self, keyset, history): - result = ([], []) + result = ([],[]) for key in keyset: if key in history: - print 'circular dependency detected:\n%s' % str(history) + print 'circular dependency:%s' % history continue - history.append(key) alias = self.aliases.get(key) if alias is None: result[0].append(key) continue + history.append(key) alias.hits += 1 - for ks in alias.expanded(history): - result[1].append(ks) + for deps in alias.expanded(history): + result[1].append(deps) + if len(result[1]): + result = ([], result[1]) return result def findaliases(self):

1 0

9 commits - client/tools java/code rel-eng/packages spec-tree/spacewalk-repo
by Pradeep Kilambi 01 Apr '09

01 Apr '09

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(a)redhat.com> Date: Wed Apr 1 10:09:46 2009 -0400 Merge branch 'vader' commit bea9453378fbed4511a2d43bf7507d538bca6abf Author: Pradeep Kilambi <pkilambi(a)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/%{name}-%{version}.tar.gz 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(a)redhat.com> 0.4.7-1 +- new build for 485880 (pkilambi(a)redhat.com) + * Wed Apr 1 2009 Pradeep Kilambi <pkilambi(a)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(a)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(a)redhat.com> +- Resolves: 485880 - missing help and man options for rhnpush - new build + * Wed Mar 11 2009 jesus m. rodriguez <jesusr(a)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(a)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(a)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(a)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(a)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/%{version}/%{reposubdir}/\$basearch/os/ +baseurl=http://spacewalk.redhat.com/yum/%{version}/%{reposubdir}/\$basearch/ 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(a)redhat.com> 0.5.1-1 +* Tue Mar 31 2009 jesus m. rodriguez <jesusr(a)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(a)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(a)redhat.com> 0.6-1 -- - -* Thu Mar 31 2009 jesus m. rodriguez <jesusr(a)redhat.com> -- building new version to point to 0.5 repo +* Tue Mar 31 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.5.1-1 +- rebuilding for 0.5 * Thu Jan 15 2009 Jan Pazdziora 0.4-1 - building new version to point to 0.4 repo commit 39f5138f1f4a59ce501584f1f19567f9b5c3d0e9 Author: jesus m. rodriguez <jesusr(a)redhat.com> Date: Tue Mar 31 22:34:13 2009 -0400 Automatic commit of package [spacewalk-repo] release [0.6-1]. diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo index 76d82e7..82c569f 100644 --- a/rel-eng/packages/spacewalk-repo +++ b/rel-eng/packages/spacewalk-repo @@ -1 +1 @@ -0.4-1 spec-tree/spacewalk-repo/ +0.6-1 spec-tree/spacewalk-repo/ diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index e058920..cdbe947 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.4 +Version: 0.6 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/5Server +%define reposubdir RHEL/5 # 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/%{version}/%{reposubdir}/\$basearch/ +baseurl=http://spacewalk.redhat.com/yum/%{version}/%{reposubdir}/\$basearch/os/ gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk enabled=1 gpgcheck=1 @@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/yum.repos.d/spacewalk.repo %changelog +* Tue Mar 31 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6-1 +- + +* Thu Mar 31 2009 jesus m. rodriguez <jesusr(a)redhat.com> +- building new version to point to 0.5 repo + * Thu Jan 15 2009 Jan Pazdziora 0.4-1 - building new version to point to 0.4 repo

1 0

Changes to 'refs/tags/rhnpush-0.4.7-1'
by Pradeep Kilambi 01 Apr '09

01 Apr '09

Tag 'rhnpush-0.4.7-1' created by Pradeep Kilambi <pkilambi(a)redhat.com> at 2009-04-01 14:07 +0000 Tagging package [rhnpush] version [0.4.7-1] in directory [client/tools/rhnpush/]. Changes since spacewalk-repo-0.5.2-1-4: --- 0 files changed ---

1 0

Branch 'VADER' - client/tools
by Pradeep Kilambi 01 Apr '09

01 Apr '09

client/tools/rhnpush/rhnpush.spec | 3 +++ 1 file changed, 3 insertions(+) New commits: commit ff4d6e0115a6593bc8a910709292672a7cd11c50 Author: Pradeep Kilambi <pkilambi(a)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(a)redhat.com> +- Resolves: 485880 - missing help and man options for rhnpush - new build + * Wed Mar 11 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.4.6-1 - 485880 - adding missing man page options to rhnpush - Fix tab in rhnpush.py.

1 0

Branch 'VADER' - java/code
by Brad Buckingham 01 Apr '09

01 Apr '09

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/manager/org/CreateOrgCommand.java | 3 + java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 17 ---------- 5 files changed, 5 insertions(+), 42 deletions(-) New commits: commit cf74d0129af6493970fc715307eb0aab410dea8c Author: Brad Buckingham <bbuckingham(a)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); - } - }

1 0

Branch 'VADER' - java/code
by Brad Buckingham 01 Apr '09

01 Apr '09

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 20 ++++++++-- 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit b56536d715922ac98eca9fcb77a428a4a976eb74 Author: Brad Buckingham <bbuckingham(a)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; }

1 0

testfile2
by Jesus M. Rodriguez 01 Apr '09

01 Apr '09

testfile2 | 1 + 1 file changed, 1 insertion(+) New commits: commit f9b426d4030a94cc1065c1a5df15d6846821e4a6 Author: jesus m. rodriguez <jesusr(a)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

1 0

Branch 'VADER' - testfile2
by Jesus M. Rodriguez 01 Apr '09

01 Apr '09

testfile2 | 1 + 1 file changed, 1 insertion(+) New commits: commit 2bfe20fb4a29e661b8c41c1bc7bd7a747e44c6ec Author: jesus m. rodriguez <jesusr(a)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

1 0

3 commits - web/modules
by Milan Zazrivec 01 Apr '09

01 Apr '09

web/modules/rhn/RHN/SatInstall.pm | 69 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) New commits: commit 7714864d4a100931c0071695f659e2b2608aa6ae Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Apr 1 13:43:10 2009 +0200 Revert "484702 - remove dead function generate_server_pem from RHN::SatInstall." This reverts commit 128f4ee11c4bbd18690b4974f51e97db07849c32. Conflicts: web/modules/rhn/RHN/SatInstall.pm generate_server_pem() is still needed by rhn-enable-push.pl (rhn-upgrade package). This cannot be replaced by Spacewalk::Setup::generate_server_pem(), because we need to be able to install rhn-upgrade on all Satellite versions, even those that do not have Spacewalk::Setup module. diff --git a/web/modules/rhn/RHN/SatInstall.pm b/web/modules/rhn/RHN/SatInstall.pm index 4a9d72c..c4be158 100644 --- a/web/modules/rhn/RHN/SatInstall.pm +++ b/web/modules/rhn/RHN/SatInstall.pm @@ -475,6 +475,37 @@ sub get_db_population_errors { return @errors; } +sub generate_server_pem { + my $class = shift; + my %params = validate(@_, { ssl_dir => 1, + system => 1, + out_file => 0 }); + + my @opts; + + push @opts, '--ssl-dir=' . File::Spec->catfile($params{ssl_dir}, $params{system}); + + if ($params{out_file}) { + push @opts, '--out-file=' . $params{out_file}; + } + my $opts = join(' ', @opts); + + my $content; + + open(FH, "/usr/bin/sudo /usr/bin/rhn-generate-pem.pl $opts |") + or throw "(satinstall:generate_pem_error) Could not generate server.pem file: $OS_ERROR"; + + my @content = <FH>; + + close(FH); + + if (not $params{out_file}) { + $content = join('', @content); + } + + return $content; +} + sub is_rpm_installed { my $class = shift; my $rpmname = shift; commit 966b9e7a545130fde46fb324a9fb1fa460551ec0 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Apr 1 13:23:29 2009 +0200 Revert "484703 - remove dead function generate_satcon_dict from RHN::SatInstall." This reverts commit 1de6c23dc8c136aa5576252a27ab9a27ee4730bd. generate_satcon_dict() is still needed by rhn-load-config.pl (rhn-upgrade package). This cannot be replaced by Spacewalk::Setup::generate_satcon_dict(), since we need to be able to install rhn-upgrade package on all satellite versions, even those that do not have Spacewalk::Setup module. diff --git a/web/modules/rhn/RHN/SatInstall.pm b/web/modules/rhn/RHN/SatInstall.pm index 51642ed..4a9d72c 100644 --- a/web/modules/rhn/RHN/SatInstall.pm +++ b/web/modules/rhn/RHN/SatInstall.pm @@ -66,6 +66,24 @@ use constant DB_POP_LOG_SIZE => 154000; # Some utility functions to do the configuration steps needed for the # satellite install. +sub generate_satcon_dict { + my $class = shift; + my %params = validate(@_, { conf_file => { default => DEFAULT_SATCON_DICT }, + tree => { default => DEFAULT_RHN_SATCON_TREE }, + }); + + my $ret = system("/usr/bin/sudo", "/usr/bin/satcon-build-dictionary.pl", + "--tree=" . $params{tree}, + "--target=" . $params{conf_file}); + + if ($ret) { + throw 'There was a problem building the satcon dictionary. ' + . 'See the webserver error log for details.'; + } + + return; +} + sub satcon_deploy { my $class = shift; my %params = validate(@_, { conf_file => { default => DEFAULT_SATCON_DICT }, commit e1c35fe888d405217ce8ee4096c9b449ee3573e9 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Wed Apr 1 13:21:16 2009 +0200 Revert "484705 - remove dead function satcon_deploy from RHN::SatInstall." This reverts commit 2d680d9b12843b624c6fedfc70a366023a8911bd. satcon_deploy() is still needed by rhn-enable-monitoring.pl, rhn-enable-push.pl and rhn-load-config.pl (rhn-upgrade package). This cannot be replaced by Spacewalk::Setup::satcon_deploy(), because we need to be able to install rhn-upgrade on all Satellite versions, even those that do not have Spacewalk::Setup module. diff --git a/web/modules/rhn/RHN/SatInstall.pm b/web/modules/rhn/RHN/SatInstall.pm index d2885fe..51642ed 100644 --- a/web/modules/rhn/RHN/SatInstall.pm +++ b/web/modules/rhn/RHN/SatInstall.pm @@ -66,6 +66,26 @@ use constant DB_POP_LOG_SIZE => 154000; # Some utility functions to do the configuration steps needed for the # satellite install. +sub satcon_deploy { + my $class = shift; + my %params = validate(@_, { conf_file => { default => DEFAULT_SATCON_DICT }, + tree => { default => DEFAULT_RHN_SATCON_TREE }, + dest => { default => '/etc' }, + }); + + my @opts = ("--source=" . $params{tree}, "--dest=" . $params{dest}, + "--conf=" . $params{conf_file}); + + my $ret = system("/usr/bin/sudo", "/usr/bin/satcon-deploy-tree.pl", @opts); + + if ($ret) { + throw 'There was a problem deploying the satellite configuration. ' + . 'See the webserver error log for details.'; + } + + return; +} + sub write_config { my $class = shift; my $options = shift;

1 0

spacewalk/setup
by Jan Pazdziora 01 Apr '09

01 Apr '09

spacewalk/setup/share/oracle/install-db.sh | 2 -- 1 file changed, 2 deletions(-) New commits: commit 8eebf11c61294e9ccd8bd45c4854126153d1b865 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Apr 1 10:40:39 2009 +0200 391771 - removing usermod from install-db.sh, we should do it in %pre of some rpm. In any case, we need to append (-a), and we need to test first and if the user is in those groups, do nothing. diff --git a/spacewalk/setup/share/oracle/install-db.sh b/spacewalk/setup/share/oracle/install-db.sh index f07fabc..665abbd 100644 --- a/spacewalk/setup/share/oracle/install-db.sh +++ b/spacewalk/setup/share/oracle/install-db.sh @@ -36,8 +36,6 @@ if selinuxenabled && semodule -l | grep '^oracle-rhnsat\b' ; then RUNRESTORECON=--run-restorecon fi -usermod -G oracle,dba,apache oracle - ORACLE_ADMIN_DIR=/opt/apps/oracle/admin/10.2.0 export ORACLE_ADMIN_DIR

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2009