spacewalk-commits February 2011

spacewalk-commits@lists.fedorahosted.org

9 participants
356 discussions

2 commits - web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/rhn/RHN/Utils.pm | 3 ++- web/modules/sniglets/Sniglets/ListView/UserList.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 5eb93a8fc2218d4befa7e6a8a57af40220c74169 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:58:04 2011 +0100 Make the $item lexical. diff --git a/web/modules/sniglets/Sniglets/ListView/UserList.pm b/web/modules/sniglets/Sniglets/ListView/UserList.pm index 54a9bfd..82a872a 100644 --- a/web/modules/sniglets/Sniglets/ListView/UserList.pm +++ b/web/modules/sniglets/Sniglets/ListView/UserList.pm @@ -286,7 +286,7 @@ sub update_channel_roles { @seen{@new_users} = (); #lookup table # determine blessed users who are not new users and remove manage role - for $item (@blessed_users) { push ( @remove_users, $item ) unless exists $seen{$item}; } + for my $item (@blessed_users) { push ( @remove_users, $item ) unless exists $seen{$item}; } $user->org->remove_channel_permissions(-uids => \@remove_users, -cid => $cid, -role => $attr{role}); # reset new users role that are selected commit bb1af4a3784a67ff2931006af185adc32e5bf598 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:55:25 2011 +0100 Localize the FH; also use three-parameter open. diff --git a/web/modules/rhn/RHN/Utils.pm b/web/modules/rhn/RHN/Utils.pm index 6e8d6a6..6f5e3b5 100644 --- a/web/modules/rhn/RHN/Utils.pm +++ b/web/modules/rhn/RHN/Utils.pm @@ -56,7 +56,8 @@ sub read_file { throw "(file_not_readable) Could not read '$filename'"; } - open(FH, $filename) or throw "(file_open_error) Could not open '$filename': $!"; + local * FH; + open(FH, '<', $filename) or throw "(file_open_error) Could not open '$filename': $!"; my @lines = <FH>;

1 0

web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/rhn/RHN/Cache/File.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 9ed4a32fc655eed81196e2e2a4ad0dc613e51314 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:52:45 2011 +0100 Localize the DATA; also use three-parameter open. diff --git a/web/modules/rhn/RHN/Cache/File.pm b/web/modules/rhn/RHN/Cache/File.pm index db46a96..ded91ed 100644 --- a/web/modules/rhn/RHN/Cache/File.pm +++ b/web/modules/rhn/RHN/Cache/File.pm @@ -88,7 +88,8 @@ sub contents { my $path = $self->path; local $/; - open(DATA, "< $path") or throw "Could not open '$path' - $!"; + local * DATA; + open(DATA, '<', $path) or throw "Could not open '$path' - $!"; my $ret = <DATA>; close(DATA);

1 0

web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/rhn/RHN/DB/SatCluster.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4afcdb0c5ac9ae97a6e2b10fd898ce194a10287c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:50:32 2011 +0100 Localize the RANDOM; also use three-parameter open. diff --git a/web/modules/rhn/RHN/DB/SatCluster.pm b/web/modules/rhn/RHN/DB/SatCluster.pm index 12d25c5..0d787aa 100644 --- a/web/modules/rhn/RHN/DB/SatCluster.pm +++ b/web/modules/rhn/RHN/DB/SatCluster.pm @@ -334,7 +334,8 @@ sub push_config { ######################### sub generate_shared_key { ######################### - open(RANDOM, '/dev/urandom') or die 'could not open /dev/urandom for reading!'; + local * RANDOM; + open(RANDOM, '<', '/dev/urandom') or die 'could not open /dev/urandom for reading!'; binmode(RANDOM); my $rand_data; my $result = read(RANDOM, $rand_data, 128);

1 0

web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/rhn/RHN/Postal.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6029d6403ef41308fb0429b5f61d319b5f0cffde Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:47:02 2011 +0100 Localize the FH; also use three-parameter open. diff --git a/web/modules/rhn/RHN/Postal.pm b/web/modules/rhn/RHN/Postal.pm index d296be6..700f60b 100644 --- a/web/modules/rhn/RHN/Postal.pm +++ b/web/modules/rhn/RHN/Postal.pm @@ -58,7 +58,8 @@ sub template { $full_filename = $filename; } - open FH, "< $full_filename" + local * FH; + open FH, '<', $full_filename or die "Can't open $full_filename: $!"; local $/ = undef;

1 0

Changes to 'refs/tags/spacewalk-java-1.4.5-1'
by Tomas Lestach 17 Feb '11

17 Feb '11

Tag 'spacewalk-java-1.4.5-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-02-17 16:39 +0000 Tagging package [spacewalk-java] version [1.4.5-1] in directory [java/]. Changes since spacewalk-backend-1.4.9-1: Milan Zazrivec (1): handle installations of less recent package versions correctly Paresh Mutha (1): 601524 - fixing allowed kickstart advanced options Tomas Lestach (5): 601524 updating kickstart.profile.setAdvancedOptions apidoc removing ehcache buildrequire remove ehcache from java/buildconf/build-props.xml remove ehcache from java/ivy.xml Automatic commit of package [spacewalk-java] release [1.4.5-1]. --- client/rhel/yum-rhn-plugin/actions/packages.py | 15 +++++++++- java/buildconf/build-props.xml | 4 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 6 ++-- java/ivy.xml | 1 java/spacewalk-java.spec | 14 ++++++++- rel-eng/packages/spacewalk-java | 2 - 6 files changed, 32 insertions(+), 10 deletions(-) ---

1 0

4 commits - java/buildconf java/ivy.xml java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 17 Feb '11

17 Feb '11

java/buildconf/build-props.xml | 4 ++-- java/ivy.xml | 1 - java/spacewalk-java.spec | 14 ++++++++++++-- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) New commits: commit 14f31c9c90f241d99b62f2532e9911ee4145c6d5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Feb 17 17:39:40 2011 +0100 Automatic commit of package [spacewalk-java] release [1.4.5-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index c5d7b43..637a30e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -532,6 +532,17 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Feb 17 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.5-1 +- remove ehcache from java/ivy.xml (tlestach(a)redhat.com) +- remove ehcache from java/buildconf/build-props.xml (tlestach(a)redhat.com) +- removing ehcache buildrequire (tlestach(a)redhat.com) +- 601524 updating kickstart.profile.setAdvancedOptions apidoc + (tlestach(a)redhat.com) +- 601524 - fixing allowed kickstart advanced options (pmutha(a)redhat.com) +- 669167 - add apidoc for activationkey.setDetails parameters + (tlestach(a)redhat.com) +- Extend the copyright year to 2011. (jpazdziora(a)redhat.com) + * Fri Feb 11 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.4-1 - 645391 - fixing improper actions, when adding virtualization entitlement to the activation key (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 9f765c4..7fca166 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.4.4-1 java/ +1.4.5-1 java/ commit 8f9a53fd1a0f281413a42d209c4588011276c3ef Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Feb 17 16:18:25 2011 +0100 remove ehcache from java/ivy.xml diff --git a/java/ivy.xml b/java/ivy.xml index a817116..6566efa 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -26,7 +26,6 @@ <dependency org="redhat" name="commons-validator" rev="1.1.4" /> <dependency org="redhat" name="concurrent" rev="1.3.2" /> <dependency org="redhat" name="dom4j" rev="1.6.1" /> - <dependency org="redhat" name="ehcache" rev="1.1" /> <dependency org="redhat" name="emma" rev="20040713" /> <dependency org="redhat" name="emma_ant" rev="20040713" /> <dependency org="redhat" name="hibernate3" rev="3.2.4.1" /> commit 19a857a0b4dd93208d6d286d462685fc45a1024a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Feb 17 16:17:53 2011 +0100 remove ehcache from java/buildconf/build-props.xml diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml index bdd6576..90e0a34 100644 --- a/java/buildconf/build-props.xml +++ b/java/buildconf/build-props.xml @@ -84,7 +84,7 @@ concurrent" /> <property name="run.jar.dependencies" - value="antlr ${asm} cglib c3p0 commons-discovery dom4j ehcache jaf jta + value="antlr ${asm} cglib c3p0 commons-discovery dom4j jaf jta ojdbc14 oscache sitemesh taglibs-standard xalan-j2 xerces-j2 xml-commons-apis ${common.jar.dependencies}" /> @@ -99,7 +99,7 @@ ${install.common.jar.dependencies} tanukiwrapper" /> <property name="install.run.jar.dependencies" - value="antlr ${asm} cglib c3p0 commons-discovery dom4j ehcache jaf jta + value="antlr ${asm} cglib c3p0 commons-discovery dom4j jaf jta oscache sitemesh taglibs-standard xalan-j2 xerces-j2 xml-commons-apis ${install.common.jar.dependencies}" /> commit 70e23e07123bb693eac05204b4ef712c423df7e5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Feb 17 14:06:49 2011 +0100 removing ehcache buildrequire diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 0e682f6..c5d7b43 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -109,7 +109,6 @@ BuildRequires: bcel BuildRequires: c3p0 BuildRequires: concurrent BuildRequires: cglib -BuildRequires: ehcache BuildRequires: dom4j BuildRequires: hibernate3 BuildRequires: jakarta-commons-cli

1 0

client/rhel
by Milan Zazrivec 17 Feb '11

17 Feb '11

client/rhel/yum-rhn-plugin/actions/packages.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit fd657459014a569811dd382bf009cc0db39143f0 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Feb 17 16:46:38 2011 +0100 handle installations of less recent package versions correctly This fix is to correctly handle situations where we're installing a package in a particular version while having more recent version of that package already installed on the system. diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py b/client/rhel/yum-rhn-plugin/actions/packages.py index 737cd85..1891985 100644 --- a/client/rhel/yum-rhn-plugin/actions/packages.py +++ b/client/rhel/yum-rhn-plugin/actions/packages.py @@ -328,9 +328,22 @@ def update(package_list, cache_only=None): ver=pkgkeys['version'], rel=pkgkeys['release']) if pkgs: - log.log_debug('Package %s already installed and latest version' + log.log_debug('Package %s already installed' \ % _yum_package_tup(package)) package_list.remove(package) + else: + found = False + evr = yum.packages.PackageEVR(pkgkeys['epoch'], \ + pkgkeys['version'], pkgkeys['release']) + + for pkg in yum_base.rpmdb.searchNevra(name=pkgkeys['name'], arch=pkgkeys['arch']): + if pkg.returnEVR() > evr: + found = True + + if found: + log.log_debug('More recent version of package %s is already installed' \ + % _yum_package_tup(package)) + package_list.remove(package) # Don't proceed further with empty list, # since this would result into an empty yum transaction

1 0

2 commits - java/code
by Tomas Lestach 17 Feb '11

17 Feb '11

java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 99b890b20d843c687cbbabe7fa9acca6f9949134 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Feb 17 12:37:20 2011 +0100 601524 updating kickstart.profile.setAdvancedOptions apidoc diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index 9ce7c8b..0b94dc0 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -454,8 +454,8 @@ public class ProfileHandler extends BaseHandler { * mouse, device, deviceprobe, zerombr, clearpart, bootloader, * timezone, auth, rootpw, selinux, reboot, firewall, xconfig, skipx, * key, ignoredisk, autopart, cmdline, firstboot, graphical, iscsi, - * iscsiname, logging, monitor, multipath, poweroff, halt, service, - * shutdown, user, vnc, zfcp") + * iscsiname, logging, monitor, multipath, poweroff, halt, services, + * shutdown, user, vnc, zfcp", "driverdisk") * #prop_desc("string", "arguments", "Arguments of the option") * #struct_end() * #array_end() commit c996955d0ea39fe06b97ec7e085808c7d04e5a2b Author: Paresh Mutha <pmutha(a)redhat.com> Date: Thu Feb 17 12:33:31 2011 +0100 601524 - fixing allowed kickstart advanced options diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index 248fb1a..9ce7c8b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -479,7 +479,7 @@ public class ProfileHandler extends BaseHandler { "selinux", "reboot", "firewall", "xconfig", "skipx", "key", "ignoredisk", "autopart", "cmdline", "firstboot", "graphical", "iscsi", "iscsiname", "logging", "monitor", "multipath", "poweroff", "halt", - "service", "shutdown", "user", "vnc", "zfcp"}; + "services", "shutdown", "user", "vnc", "zfcp", "driverdisk"}; List<String> validOptions = Arrays.asList(validOptionNames);

1 0

Changes to 'refs/tags/spacewalk-backend-1.4.9-1'
by Michael Mraka 17 Feb '11

17 Feb '11

Tag 'spacewalk-backend-1.4.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-02-17 10:43 +0000 Tagging package [spacewalk-backend] version [1.4.9-1] in directory [backend/]. Changes since spacewalk-web-1.4.3-1: Michael Mraka (3): fixed No module named common reused already defined %%{pythonrhnroot} Automatic commit of package [spacewalk-backend] release [1.4.9-1]. --- backend/spacewalk-backend.spec | 24 ++++++++++++++---------- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) ---

1 0

3 commits - backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 17 Feb '11

17 Feb '11

backend/spacewalk-backend.spec | 24 ++++++++++++++---------- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) New commits: commit c15e1dab32a34f18368e257df3083e1a95919002 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Feb 17 11:43:17 2011 +0100 Automatic commit of package [spacewalk-backend] release [1.4.9-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index cd39217..8dab85c 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.4.8 +Version: 1.4.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -686,6 +686,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Thu Feb 17 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.9-1 +- fixed No module named common +- 677549 - do not require spacewalk-backend-libs in the same version + * Thu Feb 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.8-1 - fixed packaging problem diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 97af9c8..5896fe5 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.4.8-1 backend/ +1.4.9-1 backend/ commit 3579a5c008dec4d2408ece1b81891a47e62d3f90 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Feb 17 11:38:33 2011 +0100 reused already defined %%{pythonrhnroot} diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 465a87f..cd39217 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -552,15 +552,15 @@ rm -f %{rhnconf}/rhnSecret.py* %files libs %defattr(-,root,root) %doc PYTHON-LICENSES.txt LICENSE -%{python_sitelib}/spacewalk/__init__.py* -%dir %{python_sitelib}/spacewalk/common +%{pythonrhnroot}/__init__.py* +%dir %{pythonrhnroot}/common %{pythonrhnroot}/common/__init__.py* -%{python_sitelib}/spacewalk/common/checksum.py* -%{python_sitelib}/spacewalk/common/fileutils.py* -%{python_sitelib}/spacewalk/common/rhn_deb.py* -%{python_sitelib}/spacewalk/common/rhn_mpm.py* -%{python_sitelib}/spacewalk/common/rhn_pkg.py* -%{python_sitelib}/spacewalk/common/rhn_rpm.py* +%{pythonrhnroot}/common/checksum.py* +%{pythonrhnroot}/common/fileutils.py* +%{pythonrhnroot}/common/rhn_deb.py* +%{pythonrhnroot}/common/rhn_mpm.py* +%{pythonrhnroot}/common/rhn_pkg.py* +%{pythonrhnroot}/common/rhn_rpm.py* %files config-files-common %defattr(-,root,root) commit 5f44bbfbd2ee94857c595a8288ef53e548956650 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Feb 17 11:35:05 2011 +0100 fixed No module named common Unable to load module rhnpush No module named common diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 4de8cd5..465a87f 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -341,7 +341,6 @@ rm -f %{rhnconf}/rhnSecret.py* %endif %dir %{pythonrhnroot} %dir %{pythonrhnroot}/common -%{pythonrhnroot}/common/__init__.py* %{pythonrhnroot}/common/apache.py* %{pythonrhnroot}/common/byterange.py* %{pythonrhnroot}/common/rhn_posix.py* @@ -555,6 +554,7 @@ rm -f %{rhnconf}/rhnSecret.py* %doc PYTHON-LICENSES.txt LICENSE %{python_sitelib}/spacewalk/__init__.py* %dir %{python_sitelib}/spacewalk/common +%{pythonrhnroot}/common/__init__.py* %{python_sitelib}/spacewalk/common/checksum.py* %{python_sitelib}/spacewalk/common/fileutils.py* %{python_sitelib}/spacewalk/common/rhn_deb.py*

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2011