Attachment 649197 Details for Bug 838033 – Patch to avoid using ZipFile

Patch to avoid using ZipFile

BZ838033.txt (text/plain), 1.25 KB, created by pierre.casenove on 2012-11-21 12:42:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pierre.casenove

Created: 2012-11-21 12:42:21 UTC

Size: 1.25 KB

patch

obsolete

>--- pm.py.orig  Wed Nov 21 12:13:05 2012
>+++ pm.py       Wed Nov 21 12:16:59 2012
>@@ -66,18 +66,23 @@
>                     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 = 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)
>
>-                if not os.path.isdir(pkgdir):
>+                if len(pd) > 1:
>                     raise UnzipException( \
>                         "patch %s contained more than 1 directory: %s" % \
>                             (pkg.name, pkgdir))
>+
>+                #if not os.path.isdir(pkgdir):
>+                #    raise UnzipException( \
>+                #        "patch %s contained more than 1 directory: %s" % \
>+                #            (pkg.name, pkgdir))
>
>                 if pkgdir == tdir:
>                     raise UnzipException( \

Actions: View

Attachments on bug 838033: 601912 | 649197 | 649550