client/tools/rhnpush/archive.py | 8 +++++++-
client/tools/rhnpush/rhnpush.spec | 9 ++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 29bce43816a01e8ab22b24452f6a81ac864d4787
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 11:16:23 2012 +0200
838044 - solaris2mpm on RHEL5 is not supported
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 38c7e7f..dc45b33 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -39,6 +39,11 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{rhnroot}
make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
MANDIR=%{_mandir}
+%if 0%{?rhel} && 0%{?rhel} < 6
+rm -fv $RPM_BUILD_ROOT%{_bindir}/solaris2mpm
+rm -fv $RPM_BUILD_ROOT%{rhnroot}/rhnpush/solaris2mpm.py*
+rm -fv $RPM_BUILD_ROOT%{_mandir}/man8/solaris2mpm.8*
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -49,10 +54,12 @@ rm -rf $RPM_BUILD_ROOT
%{rhnroot}/rhnpush/*
%attr(755,root,root) %{_bindir}/rhnpush
%attr(755,root,root) %{_bindir}/rpm2mpm
-%attr(755,root,root) %{_bindir}/solaris2mpm
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/rhn/rhnpushrc
%{_mandir}/man8/rhnpush.8*
+%if 0%{?fedora} || 0%{?rhel} > 5
+%attr(755,root,root) %{_bindir}/solaris2mpm
%{_mandir}/man8/solaris2mpm.8*
+%endif
%doc COPYING
%changelog
commit 8aa015a5f281b92772476a9233ec281299bc8af5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 13 11:09:15 2012 +0200
838044 - solaris2mpm needs zipfile with ZIP64 extension
diff --git a/client/tools/rhnpush/archive.py b/client/tools/rhnpush/archive.py
index 491b068..67c4951 100644
--- a/client/tools/rhnpush/archive.py
+++ b/client/tools/rhnpush/archive.py
@@ -22,6 +22,11 @@ import tempfile
import select
import zipfile
import tarfile
+import sys
+
+if not hasattr(zipfile, 'ZIP64_LIMIT'):
+ sys.stderr.write("%s requires zipfile with ZIP64 support.\n" %
sys.argv[0])
+ sys.exit(3)
# exceptions -------------------------------------------------------------
commit 2709293dc2a2ee550751706f5a5eb6c23827375a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 16:23:58 2012 +0200
remove trailing '/' from from archive dir
diff --git a/client/tools/rhnpush/archive.py b/client/tools/rhnpush/archive.py
index 873c870..491b068 100644
--- a/client/tools/rhnpush/archive.py
+++ b/client/tools/rhnpush/archive.py
@@ -240,7 +240,8 @@ class ZipParser(ArchiveParser):
def _explode(self, archive):
"""Explode zip archive"""
- self._archive_dir = os.path.join(self._temp_dir, self._get_archive_dir())
+ self._archive_dir = os.path.join(self._temp_dir,
+ self._get_archive_dir()).rstrip('/')
try:
self.zip_file.extractall(self._temp_dir)