Update rewheel module

This commit is contained in:
Matej Stuchlik 2014-05-27 12:42:42 +02:00
parent c75d3be7c8
commit cfa9e5212d
2 changed files with 11 additions and 5 deletions

View File

@ -75,7 +75,7 @@ unchanged:
unchanged: unchanged:
--- Python-3.4.0rc3/Lib/ensurepip/rewheel/__init__.py 1970-01-01 01:00:00.000000000 +0100 --- Python-3.4.0rc3/Lib/ensurepip/rewheel/__init__.py 1970-01-01 01:00:00.000000000 +0100
+++ Python-3.4.0rc3-rewheel/Lib/ensurepip/rewheel/__init__.py 2014-03-12 09:55:30.413152104 +0100 +++ Python-3.4.0rc3-rewheel/Lib/ensurepip/rewheel/__init__.py 2014-03-12 09:55:30.413152104 +0100
@@ -0,0 +1,133 @@ @@ -0,0 +1,136 @@
+import argparse +import argparse
+import csv +import csv
+import email.parser +import email.parser
@ -126,7 +126,10 @@ unchanged:
+ # if we have 0 or 2 or more dirs, something is wrong... + # if we have 0 or 2 or more dirs, something is wrong...
+ if len(filtered) == 1: + if len(filtered) == 1:
+ path = filtered[0] + path = filtered[0]
+ if path is not None:
+ records.append(os.path.join(path, 'RECORD')) + records.append(os.path.join(path, 'RECORD'))
+ else:
+ records.append(None)
+ return records + return records
+ +
+def rewheel_from_record(record_path, outdir): +def rewheel_from_record(record_path, outdir):

View File

@ -128,7 +128,7 @@
Summary: Version 3 of the Python programming language aka Python 3000 Summary: Version 3 of the Python programming language aka Python 3000
Name: python3 Name: python3
Version: %{pybasever}.1 Version: %{pybasever}.1
Release: 2%{?dist} Release: 3%{?dist}
License: Python License: Python
Group: Development/Languages Group: Development/Languages
@ -1396,8 +1396,8 @@ CheckPython() {
WITHIN_PYTHON_RPM_BUILD= \ WITHIN_PYTHON_RPM_BUILD= \
LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
--verbose --findleaks \ --verbose --findleaks \
%ifarch %{arm} %ifarch ppc64le
-x test_faulthandler test_gdb -x test_faulthandler
%endif %endif
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
@ -1829,6 +1829,9 @@ rm -fr %{buildroot}
# ====================================================== # ======================================================
%changelog %changelog
* Tue May 27 2014 Matej Stuchlik <mstuchli@redhat.com> - 3.4.1-3
- Update the rewheel module
* Mon May 26 2014 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-2 * Mon May 26 2014 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-2
- Fix multilib dependencies. - Fix multilib dependencies.
Resolves: rhbz#1091815 Resolves: rhbz#1091815