Attachment 649550 Details for Bug 838033 – Correct patch to avoid using ZipFile

Correct patch to avoid using ZipFile

BZ838033.txt (text/plain), 1.49 KB, created by pierre.casenove on 2012-11-22 07:09:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pierre.casenove

Created: 2012-11-22 07:09:53 UTC

Size: 1.49 KB

patch

obsolete

>From 0125a243c23719c21da161321c828248a0684a11 Mon Sep 17 00:00:00 2001
>From: Pierre Casenove <pcasenove@gmail.com>
>Date: Thu, 22 Nov 2012 07:07:35 +0000
>Subject: [PATCH] Remove use of ZipFile object to avoid ZipFile 64 extension missing in python 2.4
>
>---
> .../solaris/smartpm/smart/backends/solaris/pm.py   |   11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
>diff --git a/client/solaris/smartpm/smart/backends/solaris/pm.py b/client/solaris/smartpm/smart/backends/solaris/pm.py
>index defdf5e..3d99dae 100644
>--- a/client/solaris/smartpm/smart/backends/solaris/pm.py
>+++ b/client/solaris/smartpm/smart/backends/solaris/pm.py
>@@ -66,15 +66,10 @@ def solinstall(adminfile, path, pkg, prog=None):
>                     raise UnzipException("patch %s: unzip of %s into %s failed: %s" % \
>                                              (pkg.name, path, tdir, x))
>
>-                zf = zipfile.ZipFile(path)
>-                pd = zf.namelist()[0].split('/')[0]
>-                zf.close()
>-#                zf = os.path.basename(path)
>-#                pd = zf.rstrip(".zip")
>+                pd= os.listdir(tdir)
>+                pkgdir = os.path.join(tdir, pd[0])
>
>-                pkgdir = os.path.join(tdir, pd)
>-
>-                if not os.path.isdir(pkgdir):
>+                if len(pd) > 1:
>                     raise UnzipException( \
>                         "patch %s contained more than 1 directory: %s" % \
>                             (pkg.name, pkgdir))
>--
>1.7.4.1

Actions: View

Attachments on bug 838033: 601912 | 649197 | 649550