diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-09-22 19:27:29 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-09-22 19:27:29 (GMT) |
| commit | efb7469bf68d57b590fa477f0ea2224d339f679f (patch) | |
| tree | 70e21da044c280642f995b3fa686625a979de109 | |
| parent | bea6d372a175aff23d05b6a513c2df53aaa6fa87 (diff) | |
| parent | 43448eba072c9638416004986a10836df4d70d90 (diff) | |
| download | SCons-efb7469bf68d57b590fa477f0ea2224d339f679f.zip SCons-efb7469bf68d57b590fa477f0ea2224d339f679f.tar.gz SCons-efb7469bf68d57b590fa477f0ea2224d339f679f.tar.bz2 | |
Merged in williamblevins/scons (pull request #357)
Sorting RPM tarball sources to correct nondeterminism in ordering.
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/packaging/rpm.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 69fb621..4ae9cb2 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -43,6 +43,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - May find new (previously missed) Dlang dependencies. - May cause rebuild after upgrade due to dependency changes. - Updated Fortran-related tests to pass under GCC 5/6. + - Fixed SCons.Tool.Packaging.rpm.package source nondeterminism across builds. RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index 25b5875..0c3e1ed 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -95,6 +95,8 @@ def collectintargz(target, source, env): # find the .spec file for rpm and add it since it is not necessarily found # by the FindSourceFiles function. sources.extend( [s for s in source if str(s).rfind('.spec')!=-1] ) + # sort to keep sources from changing order across builds + sources.sort() # as the source contains the url of the source package this rpm package # is built from, we extract the target name |