client/rhel/yum-rhn-plugin/rhnplugin.py | 2 +- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++++++++- java/build.xml | 4 ++-- rel-eng/packages/yum-rhn-plugin | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-)
New commits: commit 15b6622765e6ac72b44b3b4ec79b6f11ebe08abb Merge: fba324a... 81a1597... Author: Partha Aji paji@redhat.com Date: Mon Jun 14 11:47:22 2010 -0400
Merge branch 'master' into fve
commit 81a159731c75763d1c2eacf31055df3eb14fa9fc Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jun 14 16:50:02 2010 +0200
Automatic commit of package [yum-rhn-plugin] release [1.1.3-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 7afb4e6..15f0141 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,6 +1,6 @@ Summary: RHN support for yum Name: yum-rhn-plugin -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -53,6 +53,19 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Mon Jun 14 2010 Miroslav Suchý msuchy@redhat.com 1.1.3-1 +- 598323 - yumex do not set version (msuchy@redhat.com) +- l10n: Updates to Chinese (China) (zh_CN) translation + (leahliu@fedoraproject.org) +- l10n: Updates to Spanish (Castilian) (es) translation + (gguerrer@fedoraproject.org) +- l10n: Updates to Russian (ru) translation (ypoyarko@fedoraproject.org) +- cleanup - removing translation file, which does not match any language code + (msuchy@redhat.com) +- update po files for yum-rhn-plugin (msuchy@redhat.com) +- l10n: Updates to German (de) translation (ttrinks@fedoraproject.org) +- l10n: Updates to Polish (pl) translation (raven@fedoraproject.org) + * Wed May 05 2010 Justin Sherrill jsherril@redhat.com 1.1.2-1 - 589120 - fixing issue with traceback from rhn_chec "no attribute cfg" (jsherril@redhat.com) diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 191c38b..b4664b0 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -1.1.2-1 client/rhel/yum-rhn-plugin/ +1.1.3-1 client/rhel/yum-rhn-plugin/
commit f3fbab86131955dfc5fc162aed47c8da474f0e5c Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jun 14 16:46:18 2010 +0200
598323 - yumex do not set version
addressing: YUM: Loaded plugins: multithread, rhnplugin YUM: Traceback (most recent call last): YUM: File "/usr/share/yumex/yum_childtask.py", line 61, in <module> YUM: my = YumServer(debuglevel, plugins, offline, repos) YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 158, in __init__ YUM: self.doLock() YUM: File "/usr/lib/python2.6/site-packages/yumexbackend/yum_server.py", line 226, in doLock YUM: yum.YumBase.doLock(self) YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 1377, in doLock YUM: if self.conf.uid != 0: YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 778, in <lambda> YUM: conf = property(fget=lambda self: self._getConfig(), YUM: File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 311, in _getConfig YUM: self.plugins.run('init') YUM: File "/usr/lib/python2.6/site-packages/yum/plugins.py", line 177, in run YUM: func(conduitcls(self, self.base, conf, **kwargs)) YUM: File "/usr/share/yum-plugins/rhnplugin.py", line 110, in init_hook YUM: if opts.version or (len(commands) == 0): YUM: AttributeError: Values instance has no attribute 'version'
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index c7ab606..595b1ca 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -107,7 +107,7 @@ def init_hook(conduit): "\n" + RHN_DISABLED) return
- if opts.version or (len(commands) == 0): + if (hasattr(opts,'version') and opts.version) or (len(commands) == 0): rhn_enabled = False conduit.info(10, _("Either --version, or no commands entered") + "\n" + RHN_DISABLED)
commit b7a9bfb131d18432763bff021ccd1f85e664e9ac Author: Shannon Hughes shughes@redhat.com Date: Mon Jun 14 09:47:36 2010 -0400
bumping up heap to 512m for jsp compiles
diff --git a/java/build.xml b/java/build.xml index a88c955..fbee15a 100644 --- a/java/build.xml +++ b/java/build.xml @@ -608,7 +608,7 @@ target="1.5" deprecation="${deprecation}" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="alljars"> <src path="${build.dir}/jsp-temp"/> </javac>
commit 11bb67104f1163479915deb0b82d115f5c4a0a8d Author: Shannon Hughes shughes@redhat.com Date: Mon Jun 14 09:43:22 2010 -0400
bumping up build heap to 512m
diff --git a/java/build.xml b/java/build.xml index 5f903e4..a88c955 100644 --- a/java/build.xml +++ b/java/build.xml @@ -456,7 +456,7 @@ nowarn="${nowarn}" encoding="utf-8" fork="yes" - memoryMaximumSize="256m" + memoryMaximumSize="512m" classpathref="buildjars" > <src> <path location="${build.dir}/src" />
spacewalk-commits@lists.fedorahosted.org