spacewalk-commits April 2009

spacewalk-commits@lists.fedorahosted.org

21 participants
741 discussions

Changes to 'refs/tags/spacewalk-repo-0.5-2'
by Jan Pazdziora 02 Apr '09

02 Apr '09

Tag 'spacewalk-repo-0.5-2' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-04-02 13:00 +0000 Tagging package [spacewalk-repo] version [0.5-2] in directory [spec-tree/spacewalk-repo/]. Changes since spacewalk-repo-0.5-1-1: --- 0 files changed ---

1 0

Branch 'SPACEWALK-0.5' - 2 commits - rel-eng/packages spec-tree/spacewalk-repo
by Jan Pazdziora 02 Apr '09

02 Apr '09

rel-eng/packages/spacewalk-repo | 2 +- spec-tree/spacewalk-repo/spacewalk-repo.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 4e17b22db40fc632b4d254a6a84558661773acc1 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 2 15:00:05 2009 +0200 Automatic commit of package [spacewalk-repo] release [0.5-2]. diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo index 41141ef..c45da0f 100644 --- a/rel-eng/packages/spacewalk-repo +++ b/rel-eng/packages/spacewalk-repo @@ -1 +1 @@ -0.5-1 spec-tree/spacewalk-repo/ +0.5-2 spec-tree/spacewalk-repo/ diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index bd33166..672d5c6 100644 --- a/spec-tree/spacewalk-repo/spacewalk-repo.spec +++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec @@ -1,7 +1,7 @@ Summary: Spacewalk packages yum repository configuration. Name: spacewalk-repo Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development # This src.rpm is cannonical upstream @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/yum.repos.d/spacewalk.repo %changelog -* Thu Apr 2 2009 Jan Pazdziora 0.5-1 +* Thu Apr 2 2009 Jan Pazdziora 0.5-2 - new version to point to 0.5 repo * Thu Jan 15 2009 Jan Pazdziora 0.4-1 commit 2748f443b1f8169fd334baa4f4ce59ba377b34c3 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 2 14:55:28 2009 +0200 spacewalk-repo: there is now a os/ component in the path. diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index b91bdfb..bd33166 100644 --- a/spec-tree/spacewalk-repo/spacewalk-repo.spec +++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec @@ -33,7 +33,7 @@ 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

1 0

Changes to 'refs/tags/spacewalk-repo-0.5-1'
by Jan Pazdziora 02 Apr '09

02 Apr '09

Tag 'spacewalk-repo-0.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-04-02 12:38 +0000 Tagging package [spacewalk-repo] version [0.5-1] in directory [spec-tree/spacewalk-repo/]. Changes since spacewalk-java-0.5.44-1-3: --- 0 files changed ---

1 0

Branch 'SPACEWALK-0.5' - 2 commits - rel-eng/packages spec-tree/spacewalk-repo
by Jan Pazdziora 02 Apr '09

02 Apr '09

rel-eng/packages/spacewalk-repo | 2 +- spec-tree/spacewalk-repo/spacewalk-repo.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) New commits: commit d870e3a027761c9e463a3f0e1938fbab1145ca2a Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 2 14:37:59 2009 +0200 Automatic commit of package [spacewalk-repo] release [0.5-1]. diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo index 76d82e7..41141ef 100644 --- a/rel-eng/packages/spacewalk-repo +++ b/rel-eng/packages/spacewalk-repo @@ -1 +1 @@ -0.4-1 spec-tree/spacewalk-repo/ +0.5-1 spec-tree/spacewalk-repo/ diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index ea5fd6c..b91bdfb 100644 --- a/spec-tree/spacewalk-repo/spacewalk-repo.spec +++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/yum.repos.d/spacewalk.repo %changelog +* Thu Apr 2 2009 Jan Pazdziora 0.5-1 +- 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 commit 97387df2858daa78233954862c85a3a8b14fd5f4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 2 14:36:51 2009 +0200 spacewalk-repo: update to match 0.5 paths on spacewalk.redhat.com/yum. diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec index e058920..ea5fd6c 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.5 Release: 1%{?dist} License: GPL Group: Development @@ -25,9 +25,9 @@ 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

1 0

Branch 'VADER' - 2 commits - client/tools spacewalk/setup
by Jan Pazdziora 02 Apr '09

02 Apr '09

client/tools/rhnpush/solaris2mpm.py | 2 ++ spacewalk/setup/share/oracle/install-db.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 57aa7fe52f8724f198c0774d80d78c4278dfe20f 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 commit 7ebd4c7442a643e76b3b9718264d56624c335d28 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Mar 31 18:06:44 2009 +0200 241221 - add release of the package (if it exists) to Provides. diff --git a/client/tools/rhnpush/solaris2mpm.py b/client/tools/rhnpush/solaris2mpm.py index a54cdda..299f849 100644 --- a/client/tools/rhnpush/solaris2mpm.py +++ b/client/tools/rhnpush/solaris2mpm.py @@ -657,6 +657,8 @@ def provide_self(header): header['provides'] = [] header['provides'].insert(0, dct) + if header.has_key('release'): + header['provides'].insert(1, { 'name' : dct['name'], 'flags' : 8, 'version' : "%s-%s" % (header['version'], header['release'])}) def md5sum_for_stream(data_stream): """Calcualte the md5sum for a datastream and return it in a utf8 friendly

1 0

java/code
by Justin Sherrill 02 Apr '09

02 Apr '09

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b27ff9fb410dbebdcf226f2d5601821d657c2bd0 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Apr 1 19:14:59 2009 -0400 487688 - adding text during ks tree creation to explain more detail of what is needed 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 6d00c09..68b4e23 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 @@ -16787,7 +16787,7 @@ The Distribution Label field should contain only letters, numbers, hyphens, peri The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should always match. This generally means that the versions for each field should be from the same version of Red Hat Enterprise Linux. -The Tree Path must be a local disk path on your @@PRODUCT_NAME@@ server containing the kernel and initrd required for kickstarting a system. From within the specified tree path, a kernel should be available at "./images/pxeboot/vmlinuz" and an initrd image should be available at "./images/pxeboot/initrd.img". For instance, if you have media located on the @@PRODUCT_NAME@@ server at: /var/distro-trees/rhel-5-server/ you would specify that path as your Tree Path value which would check for a kernel and initrd here: /var/distro-trees/rhel-5-server/images/pxeboot/ +The Tree Path must be a local disk path on your @@PRODUCT_NAME@@ server containing the entire kickstart tree for a distribution include kernel, initrd, and repo information, but excluding any rpms. This directory should be readable by the apache and tomcat users. From within the specified tree path, a kernel should be available at "./images/pxeboot/vmlinuz" and an initrd image should be available at "./images/pxeboot/initrd.img". For instance, if you have media located on the @@PRODUCT_NAME@@ server at: /var/distro-trees/rhel-5-server/ you would specify that path as your Tree Path value which would check for a kernel and initrd here: /var/distro-trees/rhel-5-server/images/pxeboot/ </source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/TreeCreate.do</context>

1 0

Branch 'VADER' - java/code
by Justin Sherrill 02 Apr '09

02 Apr '09

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a73fda99a7052e1092e8669da12152b349c3d7e Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Apr 1 19:14:59 2009 -0400 487688 - adding text during ks tree creation to explain more detail of what is needed 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 6d00c09..68b4e23 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 @@ -16787,7 +16787,7 @@ The Distribution Label field should contain only letters, numbers, hyphens, peri The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should always match. This generally means that the versions for each field should be from the same version of Red Hat Enterprise Linux. -The Tree Path must be a local disk path on your @@PRODUCT_NAME@@ server containing the kernel and initrd required for kickstarting a system. From within the specified tree path, a kernel should be available at "./images/pxeboot/vmlinuz" and an initrd image should be available at "./images/pxeboot/initrd.img". For instance, if you have media located on the @@PRODUCT_NAME@@ server at: /var/distro-trees/rhel-5-server/ you would specify that path as your Tree Path value which would check for a kernel and initrd here: /var/distro-trees/rhel-5-server/images/pxeboot/ +The Tree Path must be a local disk path on your @@PRODUCT_NAME@@ server containing the entire kickstart tree for a distribution include kernel, initrd, and repo information, but excluding any rpms. This directory should be readable by the apache and tomcat users. From within the specified tree path, a kernel should be available at "./images/pxeboot/vmlinuz" and an initrd image should be available at "./images/pxeboot/initrd.img". For instance, if you have media located on the @@PRODUCT_NAME@@ server at: /var/distro-trees/rhel-5-server/ you would specify that path as your Tree Path value which would check for a kernel and initrd here: /var/distro-trees/rhel-5-server/images/pxeboot/ </source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/TreeCreate.do</context>

1 0

java/code
by Justin Sherrill 01 Apr '09

01 Apr '09

java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java | 11 +++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java | 16 +++++++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java | 6 ++- java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java | 5 ++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 + java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java | 5 ++- java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java | 15 +++++++++ java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java | 1 8 files changed, 54 insertions(+), 8 deletions(-) New commits: commit aa541c21fe2239fd56bc7843749c1096d09577d1 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Apr 1 18:31:01 2009 -0400 462593 - fixing issue where creating or renaming a profile with a name that already exists would give ISE diff --git a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java index 5b7a7ab..9208fc0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java @@ -58,8 +58,12 @@ public abstract class BaseEditAction extends RhnAction { getStrutsDelegate().saveMessages(request, errors); } else { - processCommandSetters(opr, form); - ValidatorError verrors = opr.store(); + ValidatorError verrors = processCommandSetters(opr, form); + + if (verrors == null) { + verrors = opr.store(); + } + if (verrors != null) { ActionErrors storeErrors = RhnValidationHelper.validatorErrorToActionErrors(verrors); @@ -107,8 +111,9 @@ public abstract class BaseEditAction extends RhnAction { * object for storage. This is used on the submit type of request. * @param opr to process setters on. * @param form web form containing values + * @return TODO */ - protected abstract void processCommandSetters(PersistOperation opr, + protected abstract ValidatorError processCommandSetters(PersistOperation opr, DynaActionForm form); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java index c67ab0d..38b3db6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart.tree; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.kickstart.KickstartFactory; @@ -77,8 +78,20 @@ public abstract class BaseTreeAction extends BaseEditAction { } - protected void processCommandSetters(PersistOperation operation, DynaActionForm form) { + protected ValidatorError processCommandSetters(PersistOperation operation, + DynaActionForm form) { BaseTreeEditOperation bte = (BaseTreeEditOperation) operation; + + String label = form.getString(LABEL); + if (label != bte.getTree().getLabel()) { + KickstartableTree tree = KickstartFactory.lookupKickstartTreeByLabel( + label, bte.getUser().getOrg()); + if (tree != null) { + return new ValidatorError("distribution.tree.exists", tree.getLabel()); + } + } + + bte.setBasePath(form.getString(BASE_PATH)); Long channelId = (Long) form.get(CHANNEL_ID); Channel c = ChannelFactory.lookupByIdAndUser(channelId, operation.getUser()); @@ -87,6 +100,7 @@ public abstract class BaseTreeAction extends BaseEditAction { KickstartInstallType type = KickstartFactory. lookupKickstartInstallTypeByLabel(form.getString(INSTALL_TYPE)); bte.setInstallType(type); + return null; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java index 5328b1d..9f77cd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.kickstart.tree; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.PersistOperation; @@ -68,8 +69,9 @@ public class TreeDeleteAction extends BaseTreeAction { /** * {@inheritDoc} */ - protected void processCommandSetters(PersistOperation operation, DynaActionForm form) { - // NOOOP For delete + protected ValidatorError processCommandSetters(PersistOperation operation, + DynaActionForm form) { + return null; } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java index fcaeafc..5f16778 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.provisioning; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.frontend.action.BaseEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.PersistOperation; @@ -41,10 +42,12 @@ public abstract class BasePreservationListEditAction extends BaseEditAction { rctx.getRequest().setAttribute(FILE_LIST, bopr.getFileList()); } - protected void processCommandSetters(PersistOperation opr, DynaActionForm form) { + protected ValidatorError processCommandSetters(PersistOperation opr, + DynaActionForm form) { BaseFileListEditCommand bopr = (BaseFileListEditCommand) opr; bopr.setLabel(form.getString(LABEL)); bopr.updateFiles(form.getString(FILES_STRING)); + return null; } protected void processFormValues(PersistOperation opr, DynaActionForm form) { 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 91e9d0a..e0038f7 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 @@ -8076,6 +8076,9 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/channels/manage/Edit</context> </context-group> </trans-unit> + <trans-unit id="distribution.tree.exists"> + <source>A distribution already exists with the name '{0}'. Please select another name.</source> + </trans-unit> <trans-unit id="api.channel.delete.redhat"> <source>Red Hat Channels cannot be deleted, only custom channels can.</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java index 4edd4b8..e0c0c39 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java @@ -48,7 +48,10 @@ public class CobblerDistroEditCommand extends CobblerDistroCommand { Distro d = Distro.lookupById( CobblerXMLRPCHelper.getConnection(user.getLogin()), tree.getCobblerId()); - d.setName(makeCobblerName(tree)); + String newName = makeCobblerName(tree); + if (!d.getName().equals(newName)) { + d.setName(newName); + } updateCobblerFields(); return null; } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java index f104e01..0463822 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.tree; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; @@ -47,4 +48,18 @@ public class TreeCreateOperation extends BaseTreeEditOperation { return new CobblerDistroCreateCommand(this.tree, this.user); } + /** + * + * {@inheritDoc} + */ + public ValidatorError store() { + KickstartableTree tree = KickstartFactory.lookupKickstartTreeByLabel( + this.getTree().getLabel(), this.getUser().getOrg()); + if (tree != null) { + return new ValidatorError("distribution.tree.exists", tree.getLabel()); + } + return super.store(); + + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java index 6ddca39..21b1757 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java @@ -61,5 +61,6 @@ public class TreeEditOperation extends BaseTreeEditOperation { protected CobblerCommand getCobblerCommand() { return new CobblerDistroEditCommand(this.tree, this.user); } + }

1 0

Branch 'VADER' - java/code
by Justin Sherrill 01 Apr '09

01 Apr '09

java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java | 11 +++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java | 16 +++++++++- java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java | 6 ++- java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java | 5 ++- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 + java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java | 5 ++- java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java | 15 +++++++++ java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java | 1 8 files changed, 54 insertions(+), 8 deletions(-) New commits: commit 2132da4dc93d29c7247b796bef32e44fb273ed81 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Wed Apr 1 18:31:01 2009 -0400 462593 - fixing issue where creating or renaming a profile with a name that already exists would give ISE diff --git a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java index 5b7a7ab..9208fc0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java @@ -58,8 +58,12 @@ public abstract class BaseEditAction extends RhnAction { getStrutsDelegate().saveMessages(request, errors); } else { - processCommandSetters(opr, form); - ValidatorError verrors = opr.store(); + ValidatorError verrors = processCommandSetters(opr, form); + + if (verrors == null) { + verrors = opr.store(); + } + if (verrors != null) { ActionErrors storeErrors = RhnValidationHelper.validatorErrorToActionErrors(verrors); @@ -107,8 +111,9 @@ public abstract class BaseEditAction extends RhnAction { * object for storage. This is used on the submit type of request. * @param opr to process setters on. * @param form web form containing values + * @return TODO */ - protected abstract void processCommandSetters(PersistOperation opr, + protected abstract ValidatorError processCommandSetters(PersistOperation opr, DynaActionForm form); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java index c67ab0d..38b3db6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/BaseTreeAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart.tree; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.kickstart.KickstartFactory; @@ -77,8 +78,20 @@ public abstract class BaseTreeAction extends BaseEditAction { } - protected void processCommandSetters(PersistOperation operation, DynaActionForm form) { + protected ValidatorError processCommandSetters(PersistOperation operation, + DynaActionForm form) { BaseTreeEditOperation bte = (BaseTreeEditOperation) operation; + + String label = form.getString(LABEL); + if (label != bte.getTree().getLabel()) { + KickstartableTree tree = KickstartFactory.lookupKickstartTreeByLabel( + label, bte.getUser().getOrg()); + if (tree != null) { + return new ValidatorError("distribution.tree.exists", tree.getLabel()); + } + } + + bte.setBasePath(form.getString(BASE_PATH)); Long channelId = (Long) form.get(CHANNEL_ID); Channel c = ChannelFactory.lookupByIdAndUser(channelId, operation.getUser()); @@ -87,6 +100,7 @@ public abstract class BaseTreeAction extends BaseEditAction { KickstartInstallType type = KickstartFactory. lookupKickstartInstallTypeByLabel(form.getString(INSTALL_TYPE)); bte.setInstallType(type); + return null; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java index 5328b1d..9f77cd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.kickstart.tree; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.PersistOperation; @@ -68,8 +69,9 @@ public class TreeDeleteAction extends BaseTreeAction { /** * {@inheritDoc} */ - protected void processCommandSetters(PersistOperation operation, DynaActionForm form) { - // NOOOP For delete + protected ValidatorError processCommandSetters(PersistOperation operation, + DynaActionForm form) { + return null; } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java index fcaeafc..5f16778 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/BasePreservationListEditAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.provisioning; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.frontend.action.BaseEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.PersistOperation; @@ -41,10 +42,12 @@ public abstract class BasePreservationListEditAction extends BaseEditAction { rctx.getRequest().setAttribute(FILE_LIST, bopr.getFileList()); } - protected void processCommandSetters(PersistOperation opr, DynaActionForm form) { + protected ValidatorError processCommandSetters(PersistOperation opr, + DynaActionForm form) { BaseFileListEditCommand bopr = (BaseFileListEditCommand) opr; bopr.setLabel(form.getString(LABEL)); bopr.updateFiles(form.getString(FILES_STRING)); + return null; } protected void processFormValues(PersistOperation opr, DynaActionForm form) { 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 91e9d0a..e0038f7 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 @@ -8076,6 +8076,9 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/channels/manage/Edit</context> </context-group> </trans-unit> + <trans-unit id="distribution.tree.exists"> + <source>A distribution already exists with the name '{0}'. Please select another name.</source> + </trans-unit> <trans-unit id="api.channel.delete.redhat"> <source>Red Hat Channels cannot be deleted, only custom channels can.</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java index 4edd4b8..e0c0c39 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroEditCommand.java @@ -48,7 +48,10 @@ public class CobblerDistroEditCommand extends CobblerDistroCommand { Distro d = Distro.lookupById( CobblerXMLRPCHelper.getConnection(user.getLogin()), tree.getCobblerId()); - d.setName(makeCobblerName(tree)); + String newName = makeCobblerName(tree); + if (!d.getName().equals(newName)) { + d.setName(newName); + } updateCobblerFields(); return null; } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java index f104e01..0463822 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeCreateOperation.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.tree; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; @@ -47,4 +48,18 @@ public class TreeCreateOperation extends BaseTreeEditOperation { return new CobblerDistroCreateCommand(this.tree, this.user); } + /** + * + * {@inheritDoc} + */ + public ValidatorError store() { + KickstartableTree tree = KickstartFactory.lookupKickstartTreeByLabel( + this.getTree().getLabel(), this.getUser().getOrg()); + if (tree != null) { + return new ValidatorError("distribution.tree.exists", tree.getLabel()); + } + return super.store(); + + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java index 6ddca39..21b1757 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java @@ -61,5 +61,6 @@ public class TreeEditOperation extends BaseTreeEditOperation { protected CobblerCommand getCobblerCommand() { return new CobblerDistroEditCommand(this.tree, this.user); } + }

1 0

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

01 Apr '09

schema/spacewalk/oracle/views/views.deps | 2 +- schema/spacewalk/postgres/procs/procs.deps | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) New commits: commit 8a518ac81a4684a515e418e0b844e6ebd4424dce Author: Jeff Ortel <jortel(a)redhat.com> Date: Wed Apr 1 15:28:52 2009 -0400 add (types) to the path in oracle view .deps diff --git a/schema/spacewalk/oracle/views/views.deps b/schema/spacewalk/oracle/views/views.deps index 85a3569..da48a15 100644 --- a/schema/spacewalk/oracle/views/views.deps +++ b/schema/spacewalk/oracle/views/views.deps @@ -2,7 +2,7 @@ # Dependencies for the views directory # -path = . tables procs packages +path = . tables procs packages types rhn_customer_monitoring :: web_customer rhnHistoryView :: rhnServerHistory rhnPackageArch \ commit ea0b333cb6707653c0dffef41a9efedd03ac8f88 Author: Jeff Ortel <jortel(a)redhat.com> Date: Wed Apr 1 15:24:30 2009 -0400 synchronize oracle/pg /procs/procs.deps diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps index b1aa6b7..874bbc9 100644 --- a/schema/spacewalk/postgres/procs/procs.deps +++ b/schema/spacewalk/postgres/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 -

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