spacewalk-commits April 2012

spacewalk-commits@lists.fedorahosted.org

11 participants
288 discussions

java/code
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit cd81fdb0b95f972d85a9967bbb4f2366ef91414f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Apr 4 14:06:16 2012 +0200 Add ACL to VerifyPackages to match the ACL on the .jsp referencing it. diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 1d9d72f..266e657 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -2910,6 +2910,10 @@ <forward name="confirm" path="/systems/details/packages/VerifyConfirm.do" redirect="true" /> + <set-property property="acls" + value="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)"/> + <set-property property="mixins" + value="com.redhat.rhn.common.security.acl.SystemAclHandler"/> </action> <action path="/systems/details/packages/VerifyConfirm"

1 0

Changes to 'refs/tags/spacewalk-utils-1.8.4-1'
by Michael Mraka 05 Apr '12

05 Apr '12

Tag 'spacewalk-utils-1.8.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-04-05 10:07 +0000 Tagging package [spacewalk-utils] version [1.8.4-1] in directory [utils/]. Changes since spacewalk-java-1.8.34-1: Michael Mraka (2): made new pylint on Fedora 16 happy Automatic commit of package [spacewalk-utils] release [1.8.4-1]. Tomas Lestach (1): fix typo --- java/code/webapp/WEB-INF/struts-config.xml | 2 +- rel-eng/packages/spacewalk-utils | 2 +- utils/depsolver.py | 2 +- utils/spacewalk-utils.spec | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages utils/depsolver.py utils/spacewalk-utils.spec
by Michael Mraka 05 Apr '12

05 Apr '12

rel-eng/packages/spacewalk-utils | 2 +- utils/depsolver.py | 2 +- utils/spacewalk-utils.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit a81746ae124d7f711c835149716b598f1d5a4b09 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 5 12:07:58 2012 +0200 Automatic commit of package [spacewalk-utils] release [1.8.4-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 42471d6..7c96353 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.8.3-1 utils/ +1.8.4-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index c0af1e3..473cbaf 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.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Thu Apr 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1 +- made new pylint on Fedora 16 happy + * Tue Apr 03 2012 Jan Pazdziora 1.8.3-1 - 809444 - support for psql syntax (mzazrivec(a)redhat.com) commit 4740b505e996752ea0bc17ee6ebeeb42da23e137 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 5 12:06:53 2012 +0200 made new pylint on Fedora 16 happy diff --git a/utils/depsolver.py b/utils/depsolver.py index e18f49d..33fd383 100644 --- a/utils/depsolver.py +++ b/utils/depsolver.py @@ -158,11 +158,11 @@ class DepSolver: return results def __whatProvides(self, name, flags, version): + # pylint: disable=W0702 try: return ListPackageSack(self._repostore.pkgSack.searchProvides((name, flags, version))) except: #perhaps we're on older version of yum try old style - # pylint: disable=W0702 return ListPackageSack(self._repostore.pkgSack.searchProvides(name)) @staticmethod

1 0

java/code
by Tomas Lestach 04 Apr '12

04 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09bd2188a3b7c4aeef306266560e6d087474644d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 4 16:09:24 2012 +0200 fix typo diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index e20aa63..1d9d72f 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6109,7 +6109,7 @@ type="com.redhat.rhn.frontend.action.systems.virtualization.ProvisionVirtualizationWizardAction" className="com.redhat.rhn.frontend.struts.RhnActionMapping"> <set-property property="postRequiredIfSubmitted" value="true" /> - <set-property property="acls" value="not system_is_virtual(); system_has_management_entitlement();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)>"/> + <set-property property="acls" value="not system_is_virtual(); system_has_management_entitlement();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/> <forward name="first" path="/WEB-INF/pages/systems/details/virtualization/provision/first.jsp"/> <forward name="second"

1 0

Changes to 'refs/tags/spacewalk-java-1.8.34-1'
by StephenHerr 04 Apr '12

04 Apr '12

Tag 'spacewalk-java-1.8.34-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-04 14:53 +0000 Tagging package [spacewalk-java] version [1.8.34-1] in directory [java/]. Changes since spacewalk-schema-1.8.14-1: Jan Pazdziora (2): No not report changes that we do not want/need to tag on. 805952 - make the "allocation to equal" value optional. Stephen Herr (2): 809868 - Make automatically-scheduled tasks visible on Failed and Archived tabs Automatic commit of package [spacewalk-java] release [1.8.34-1]. Tomas Lestach (1): Fix naming of cloned errata to replace only the first 2 chars --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 ++++---- java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 4 ++-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd | 1 + java/spacewalk-java.spec | 10 +++++++++- rel-eng/git-untagged-commits.pl | 4 +++- rel-eng/packages/spacewalk-java | 2 +- web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 ++-- 9 files changed, 26 insertions(+), 15 deletions(-) ---

1 0

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

04 Apr '12

java/spacewalk-java.spec | 10 +++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 6192a21f6dd06f9938acbbaafeed22e237bb6604 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 4 10:53:58 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.34-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 62f1f53..2652f47 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.33 +Version: 1.8.34 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -604,6 +604,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Apr 04 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1 +- 809868 - Make automatically-scheduled tasks visible on Failed and Archived + tabs (sherr(a)redhat.com) +- 805952 - make the "allocation to equal" value optional. + (jpazdziora(a)redhat.com) +- Fix naming of cloned errata to replace only the first 2 chars + (tlestach(a)redhat.com) + * Tue Apr 03 2012 Jan Pazdziora 1.8.33-1 - 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 6327a3a..e1de6a9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.33-1 java/ +1.8.34-1 java/

1 0

java/code
by StephenHerr 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ee785ba386efac238bf2848f222369337623f332 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 4 10:36:13 2012 -0400 809868 - Make automatically-scheduled tasks visible on Failed and Archived tabs diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml index b2c5416..b5162ca 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml @@ -217,12 +217,12 @@ SELECT DISTINCT UAO.id AS ID, (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status IN (0,1)) AS "IN_PROGRESS_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS" - FROM rhnUserActionOverview UAO, web_contact WC + FROM rhnUserActionOverview UAO left join + web_contact WC on UAO.scheduler = WC.id WHERE UAO.org_id = :org_id AND UAO.user_id = :user_id AND UAO.action_status_id = 3 AND UAO.archived = 0 - AND WC.id = UAO.scheduler ORDER BY EARLIEST DESC </query> @@ -242,11 +242,11 @@ SELECT DISTINCT UAO.id AS ID, (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status IN (0,1)) AS "IN_PROGRESS_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS" - FROM rhnUserActionOverview UAO, web_contact WC + FROM rhnUserActionOverview UAO left join + web_contact WC on UAO.scheduler = WC.id WHERE UAO.org_id = :org_id AND UAO.user_id = :user_id AND UAO.archived = 1 - AND WC.id = UAO.scheduler ORDER BY EARLIEST DESC </query>

1 0

java/code
by Jan Pazdziora 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd | 1 + 1 file changed, 1 insertion(+) New commits: commit 272edc3f43e10ff3de95a90624103829a24dd0b4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Apr 4 11:46:02 2012 +0200 805952 - make the "allocation to equal" value optional. diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd index 8de7dda..45fc182 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd @@ -8,6 +8,7 @@ <simpleType baseType="int"> <minLength value="1" /> <maxLength value="10" /> + <optional/> </simpleType> </attribute>

1 0

java/code web/modules
by Tomas Lestach 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 4 ++-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 4 ++-- web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 96f4e2cdeebc50d35b8a0e959506452eadb0aa26 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 4 10:37:50 2012 +0200 Fix naming of cloned errata to replace only the first 2 chars when replacing first 3 chars, errata type information gets lost (RHBA - > CLA / CLBA) based on Johannes Renner pathes from: https://www.redhat.com/archives/spacewalk-devel/2012-March/msg00022.html just prepending "CL-" to the original erratum name isn't good due to the maximum errata name limitation diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 586be0b..f4477cc 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -379,8 +379,8 @@ public class ErrataFactory extends HibernateFactory { public static Errata createClone(Org org, Errata e) { - String baseClonedAdvisoryName = "CL" + e.getAdvisoryName().substring(3); - String baseClonedAdvisory = "CL" + e.getAdvisory().substring(3); + String baseClonedAdvisoryName = "CL" + e.getAdvisoryName().substring(2); + String baseClonedAdvisory = "CL" + e.getAdvisory().substring(2); String clonedAdvisory = baseClonedAdvisory; String clonedAdvisoryName = baseClonedAdvisoryName; boolean unusedNameFound = false; 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 a304a77..15852ce 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 @@ -333,8 +333,8 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser { Channel baseChannel = ChannelTestUtils.createBaseChannel(user); published.addChannel(baseChannel); Errata clone = ErrataFactory.createClone(user.getOrg(), published); - String clonedAdvisoryName = "CL" + published.getAdvisoryName().substring(3); - String clonedAdvisory = "CL" + published.getAdvisory().substring(3); + String clonedAdvisoryName = "CL" + published.getAdvisoryName().substring(2); + String clonedAdvisory = "CL" + published.getAdvisory().substring(2); assertNotNull(clone.getId()); assertFalse(published.isCloned()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java index 6b0ffa4..0690e78 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java @@ -107,8 +107,8 @@ public class PublishErrataHelper { } - String baseClonedAdvisoryName = "CL" + original.getAdvisoryName().substring(3); - String baseClonedAdvisory = "CL" + original.getAdvisory().substring(3); + String baseClonedAdvisoryName = "CL" + original.getAdvisoryName().substring(2); + String baseClonedAdvisory = "CL" + original.getAdvisory().substring(2); String clonedAdvisory = baseClonedAdvisory; String clonedAdvisoryName = baseClonedAdvisoryName; boolean unusedNameFound = false; diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm index 8c19fa5..b295563 100644 --- a/web/modules/rhn/RHN/DB/ErrataEditor.pm +++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm @@ -159,8 +159,8 @@ sub find_next_advisory { my $suffix = ''; my $i = 1; - $adv = 'CL' . substr($adv, 3); - $adv_name = 'CL' . substr($adv_name, 3); + $adv = 'CL' . substr($adv, 2); + $adv_name = 'CL' . substr($adv_name, 2); if (advisory_exists($adv) || advisory_name_exists($adv_name)) { $suffix = sprintf("-%u", $i++);

1 0

rel-eng/git-untagged-commits.pl
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/git-untagged-commits.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 3deb3374bd3874b90c6a9e7772d552000dfd4a4b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 17:00:40 2012 +0200 No not report changes that we do not want/need to tag on. diff --git a/rel-eng/git-untagged-commits.pl b/rel-eng/git-untagged-commits.pl index 3381056..7bd04b1 100755 --- a/rel-eng/git-untagged-commits.pl +++ b/rel-eng/git-untagged-commits.pl @@ -34,7 +34,9 @@ for my $file (@files) { close FILE; my $name = File::Basename::basename($file); my ($version, $dir) = split /\s/, $line; - my @changes = `git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`; + my @changes = + grep { not /^\S+\s([Bb]umping package versions for|All the NoTgzBuilders are now)/ } + `git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`; if (@changes) { print "$name-$version..HEAD:\n"; print @changes, "\n";

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2012