Changes to 'refs/tags/rhnpush-5.5.28-1'
by Jan Pazdziora
Tag 'rhnpush-5.5.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-06-21 07:37 +0000
Tagging package [rhnpush] version [5.5.28-1] in directory [client/tools/rhnpush/].
Changes since rhn-client-tools-1.5.14-1:
Jan Pazdziora (1):
Automatic commit of package [rhnpush] release [5.5.28-1].
---
client/tools/rhnpush/rhnpush.spec | 6 +++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 3 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhnpush/rhnpush.spec | 6 +++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit da1ad788f5021a143059df4decd8d88f6e42910c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 21 09:37:44 2011 +0200
Automatic commit of package [rhnpush] release [5.5.28-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 79ef84c..79bcb79 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: 5.5.27
+Version: 5.5.28
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Tue Jun 21 2011 Jan Pazdziora 5.5.28-1
+- 559092 - recognize both new and old patch clusters (michael.mraka(a)redhat.com)
+- 485880 - put -N option to SYNOPSIS as well (msuchy(a)redhat.com)
+
* Thu May 05 2011 Miroslav Suchý 5.5.27-1
- do not test if rhnParent can handle session caching
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 346b7ec..beea400 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.27-1 client/tools/rhnpush/
+5.5.28-1 client/tools/rhnpush/
12 years, 3 months
Changes to 'refs/tags/rhn-client-tools-1.5.14-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.5.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-06-21 07:37 +0000
Tagging package [rhn-client-tools] version [1.5.14-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.5.47-1:
Jan Pazdziora (2):
Silence chgrp/chmod, during first installation.
Automatic commit of package [rhn-client-tools] release [1.5.14-1].
Michael Mraka (3):
559092 - new solaris patches contain installcluster
559092 - made patch cluster dir readable for nobody
559092 - recognize both new and old patch clusters
Miroslav Suchý (4):
714113 - handle writing unicode to log file
export from hosted does not know soft dependecies
676937 - allow to export all channels
485880 - put -N option to SYNOPSIS as well
Tomas Lestach (4):
708957 - remove RHN Satellite Proxy Release Notes link
710959 - rename acl: not file_is_directory -> is_file
648483 - fix system.provisionVirtualGuest NPE
690842 - fix check for existing activation key
---
backend/satellite_tools/disk_dumper/iss.py | 23 ++++++++--
backend/satellite_tools/disk_dumper/iss_ui.py | 2
backend/satellite_tools/disk_dumper/rhn-satellite-exporter.sgml | 11 ++++
backend/server/importlib/packageImport.py | 2
branding/conf/rhn_docs.conf | 1
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py | 4 -
client/solaris/smartpm/smart/backends/solaris/pm.py | 11 +++-
client/tools/rhnpush/rhnpush.sgml | 2
client/tools/rhnpush/solaris2mpm.py | 3 -
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 1
java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 5 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 3 -
java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 8 ---
java/code/webapp/WEB-INF/struts-config.xml | 2
rel-eng/packages/rhn-client-tools | 2
spacewalk/config/spacewalk-config.spec | 4 -
18 files changed, 59 insertions(+), 33 deletions(-)
---
12 years, 3 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 78ac379c3dd573753258d0f8de10bbee62603db6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 21 09:37:16 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.14-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 4e6c199..566b207 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.5.13
+Version: 1.5.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue Jun 21 2011 Jan Pazdziora 1.5.14-1
+- 714113 - handle writing unicode to log file (msuchy(a)redhat.com)
+
* Wed Jun 15 2011 Miroslav Suchý 1.5.13-1
- forward port translation from RHEL6 (msuchy(a)redhat.com)
- forward port translation from RHEL5 (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index f6395fe..9c25acc 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.13-1 client/rhel/rhn-client-tools/
+1.5.14-1 client/rhel/rhn-client-tools/
12 years, 3 months
spacewalk/config
by Jan Pazdziora
spacewalk/config/spacewalk-config.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 11f57d5cf45788039d2e2123cc7eb5ad29d2ede1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 21 09:28:05 2011 +0200
Silence chgrp/chmod, during first installation.
Addressing
chgrp: cannot access `/etc/rhn/rhn.conf': No such file or directory
chgrp: cannot access `/etc/rhn/cluster.ini': No such file or directory
chmod: cannot access `/etc/rhn/rhn.conf*': No such file or directory
chmod: cannot access `/etc/rhn/cluster.ini*': No such file or directory
chmod: cannot access `/etc/sysconfig/rhn/backup-*': No such file or directory
chmod: cannot access `/var/lib/rhn/rhn-satellite-prep/*': No such file or directory
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 8d7bb7c..3c9126f 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -99,10 +99,10 @@ if [ -f /etc/init.d/satellite-httpd ] ; then
fi
# Set the group to allow Apache to access the conf files ...
-chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini || :
+chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
# ... once we restrict access to some files that were too open in
# the past.
-chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* || :
+chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
* Tue May 17 2011 Miroslav Suchý 1.5.4-1
12 years, 3 months
3 commits - client/solaris client/tools
by Michael Mraka
client/solaris/smartpm/smart/backends/solaris/pm.py | 11 ++++++++---
client/tools/rhnpush/solaris2mpm.py | 3 ++-
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 33a363f20b7ce2bdb39a8b0692ee1017544bfb14
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 20 22:28:25 2011 +0200
559092 - recognize both new and old patch clusters
diff --git a/client/tools/rhnpush/solaris2mpm.py b/client/tools/rhnpush/solaris2mpm.py
index f4a8d83..1bd559d 100644
--- a/client/tools/rhnpush/solaris2mpm.py
+++ b/client/tools/rhnpush/solaris2mpm.py
@@ -253,7 +253,8 @@ def _close_mpm(mpm):
def _is_patch_set_archive(archive_parser):
"""[internal] Returns true iff the parser contains a patch set archive"""
- return archive_parser.contains("installcluster")
+ return (archive_parser.contains("installcluster")
+ or archive_parser.contains("install_cluster"))
def _is_patch_archive(archive_parser):
commit 34541a3be8de761467cb015ae672f890488e0eeb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 20 22:20:11 2011 +0200
559092 - made patch cluster dir readable for nobody
fixing
application of 119254-80 failed : unhandled subprocess exit status '5' (exit n branch)
diff --git a/client/solaris/smartpm/smart/backends/solaris/pm.py b/client/solaris/smartpm/smart/backends/solaris/pm.py
index a915ff8..08b7905 100644
--- a/client/solaris/smartpm/smart/backends/solaris/pm.py
+++ b/client/solaris/smartpm/smart/backends/solaris/pm.py
@@ -43,7 +43,7 @@ def solinstall(adminfile, path, pkg, prog=None):
if pkg.name.startswith("patch-"):
# Patch and patch cluster install
- tdir = tempfile.mkdtemp('-dir', 'solinstall-', '/tmp')
+ tdir = tempfile.mkdtemp('-dir', 'solinstall-', '/var/tmp')
pkgdir = ""
ret = 0
@@ -85,7 +85,7 @@ def solinstall(adminfile, path, pkg, prog=None):
(pkg.name, pkgdir))
# change the permissions on the patch directory
- cmdstr = "chmod -R 777 %s" % pkgdir
+ cmdstr = "chmod -R 777 %s" % tdir
ret, x = commands.getstatusoutput(cmdstr)
# default values
commit 9b78b9ee725eed74aa5bfd624469dce580d559d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 20 13:02:48 2011 +0200
559092 - new solaris patches contain installcluster
diff --git a/client/solaris/smartpm/smart/backends/solaris/pm.py b/client/solaris/smartpm/smart/backends/solaris/pm.py
index 3356d29..a915ff8 100644
--- a/client/solaris/smartpm/smart/backends/solaris/pm.py
+++ b/client/solaris/smartpm/smart/backends/solaris/pm.py
@@ -94,7 +94,12 @@ def solinstall(adminfile, path, pkg, prog=None):
cmd = ""
if pkg.name.startswith("patch-cluster-solaris-"):
- cmd = "%s/install_cluster -q" % pkgdir
+ if os.path.exists(os.path.join(pkgdir, 'install_cluster')):
+ cmd = "%s/install_cluster -q" % pkgdir
+ elif os.path.exists(os.path.join(pkgdir, 'installcluster')):
+ cmd = "%s/installcluster --s10cluster" % pkgdir
+ else:
+ raise PatchaddException("Neither install_cluster nor installcluster script found.")
os.chdir(pkgdir)
else:
cmd = "patchadd -u %s" % pkgdir
12 years, 3 months
client/tools
by Miroslav Suchý
client/tools/rhnpush/rhnpush.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 688ced66c8080b616b2bc17cb67c93a617ca8282
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jun 20 16:39:58 2011 +0200
485880 - put -N option to SYNOPSIS as well
diff --git a/client/tools/rhnpush/rhnpush.sgml b/client/tools/rhnpush/rhnpush.sgml
index c76f69e..59602e0 100644
--- a/client/tools/rhnpush/rhnpush.sgml
+++ b/client/tools/rhnpush/rhnpush.sgml
@@ -278,7 +278,7 @@ Utility to push binary and source RPMs into an RHN channel.
</listitem>
</varlistentry>
<varlistentry>
- <term>--new-cache</term>
+ <term>-N --new-cache</term>
<listitem>
<para>create a new username/password cache</para>
</listitem>
12 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 193bc28d0f1dad7521ef2ef25213921e641db839
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 20 16:11:11 2011 +0200
690842 - fix check for existing activation key
diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
index 6b3285c..ada8e6c 100644
--- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java
@@ -117,10 +117,11 @@ public class ActivationKeyFactory extends HibernateFactory {
keyToUse = generateKey();
}
else {
- validateKeyName(key.trim().replace(" ", ""));
+ keyToUse = key.trim().replace(" ", "");
}
keyToUse = ActivationKey.sanitize(user.getOrg(), keyToUse);
+ validateKeyName(keyToUse);
if (server != null) {
keyToUse = "re-" + keyToUse;
12 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 661713955644a7d4d1c9b10a05faefa0656859dd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 20 13:57:24 2011 +0200
648483 - fix system.provisionVirtualGuest NPE
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 0392cee..0bedfc6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2280,7 +2280,8 @@ public class SystemHandler extends BaseHandler {
cmd.setMemoryAllocation(new Long(memoryMb));
cmd.setVirtualCpus(new Long(vcpus.toString()));
cmd.setLocalStorageSize(new Long(storageMb));
-
+ // setting an empty string generates a default virt path
+ cmd.setFilePath("");
// Store the new KickstartSession to the DB.
ValidatorError ve = cmd.store();
if (ve != null) {
12 years, 3 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/struts-config.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 85c887985b1a43e78eddffe47bf06487da0b10b9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jun 17 16:50:35 2011 +0200
710959 - rename acl: not file_is_directory -> is_file
decfd969 removes aclFileIsDirecotry and introduces aclIsFile
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 07b499d..021f6f7 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6999,7 +6999,7 @@
input="/WEB-INF/pages/configuration/files/diff.jsp"
type="com.redhat.rhn.frontend.action.configuration.files.DownloadDiffAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls" value="not file_is_directory()"/>
+ <set-property property="acls" value="is_file()"/>
<set-property property="mixins" value="com.redhat.rhn.common.security.acl.ConfigAclHandler" />
<forward name="default"
path="/configuration/file/Diff.do"/>
12 years, 3 months