pefile: fix issue 67

This commit is contained in:
blshkv 2016-01-20 13:32:38 +08:00
parent d7fe201474
commit a8f8b5cc76
3 changed files with 72 additions and 3 deletions

View file

@ -1 +1 @@
DIST pefile-1.2.10-139.tar.gz 57322 SHA256 8b7c5d853c97a923d0f6e128d0ae76b962aa75fd608d552f5a32e46276908a16 SHA512 df8161a3d7659fdff26a21adc398063d909a4c0a390b6116b3d5ee293ee7d9363b524acf1b59a0758bf1556a842b35e78108e5df75433ed392b0813f98cf9d51 WHIRLPOOL f5315bfd9e2356c998a860ecc6249ae2dc5ba3b206199c86680d2e4840f47dd12d2b56dea8e61cdb6c633322b67c73a05069ffedcc739861418c0a7da4ade721
DIST pefile-1.2.10-139.tar.gz 56819 SHA256 3297cb72e6a51befefc3d9b27ec7690b743ee826538629ecf68f4eee64f331ab SHA512 9960f8c4840c17b30fd9c936245ea26e6cc5d8f8671847e52954ba6d2b27adffad9b49b129529a1df0d8be70e05ebf1ff9914f72861059f568eb240a6e08eb09 WHIRLPOOL e5c31e5681516c2e7abab7d0ffa52f8fb2d8648aa4f149d7491ede889f8a825310846980bd96ff64fe8e4dfa5646d25b51b81c15c88a123370819a490bbe1ed2

View file

@ -0,0 +1,64 @@
From 4f685a2f8b732db4803a47ba42ece688f1e72a89 Mon Sep 17 00:00:00 2001
From: Joachim Metz <joachim.metz@gmail.com>
Date: Sun, 17 May 2015 09:07:25 +0200
Subject: [PATCH] Changes for deployment.
---
pefile.py | 4 ++--
setup.py | 14 +++++++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
mode change 100644 => 100755 setup.py
diff --git a/pefile.py b/pefile.py
index afbd581..8e18591 100644
--- a/pefile.py
+++ b/pefile.py
@@ -20,9 +20,9 @@
the root of the distribution archive.
"""
-__revision__ = "$LastChangedRevision$"
+__revision__ = '139'
__author__ = 'Ero Carrera'
-__version__ = '1.2.10-%d' % int( __revision__[21:-2] )
+__version__ = '1.2.10-%d' % int( __revision__ )
__contact__ = 'ero.carrera@gmail.com'
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 2a32c22..5891068
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/python
+
+import os
+import sys
try:
from setuptools import setup
@@ -6,14 +9,19 @@
from distutils.core import setup
import pefile
-import os
+
os.environ['COPY_EXTENDED_ATTRIBUTES_DISABLE'] = 'true'
os.environ['COPYFILE_DISABLE'] = 'true'
+# build_msi does not support the 1.2.10-139 versioning schema
+# (or 1.2.10.139), hence the revision number is stripped.
+pefile_version = pefile.__version__
+if 'bdist_msi' in sys.argv:
+ pefile_version, _, _ = pefile_version.partition('-')
setup(name = 'pefile',
- version = pefile.__version__,
+ version = pefile_version,
description = 'Python PE parsing module',
author = pefile.__author__,
author_email = pefile.__contact__,

View file

@ -7,7 +7,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
MY_P=${P/_p/-}
inherit distutils-r1
inherit distutils-r1 eutils
DESCRIPTION="Module to read and work with Portable Executable (PE) files"
HOMEPAGE="https://github.com/erocarrera/pefile"
@ -20,4 +20,9 @@ IUSE=""
DEPEND=""
S="${WORKDIR}/${MY_P}"
S="${WORKDIR}/pefile-${MY_P}"
src_prepare(){
#https://github.com/erocarrera/pefile/issues/65
epatch "${FILESDIR}/pefile-1.2.10_issue65.patch"
}