update from upstream

4 files changed, 9 insertions, 7 deletions

diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py
index 1a95abe..1727938 100644
--- a/src/engine/SCons/Tool/packaging/__init__.py
+++ b/src/engine/SCons/Tool/packaging/__init__.py
@@ -72,7 +72,7 @@ def Tag(env, target, source, *more_tags, **kw_tags):
         target=env.Flatten(target)
 
     for t in target:
-        for (k,v) in kw_tags.items():
+        for (k,v) in list(kw_tags.items()):
             # all file tags have to start with PACKAGING_, so we can later
             # differentiate between "normal" object attributes and the
             # packaging attributes. As the user should not be bothered with
diff --git a/src/engine/SCons/Tool/packaging/ipk.py b/src/engine/SCons/Tool/packaging/ipk.py
index c666033..ad4fe0f 100644
--- a/src/engine/SCons/Tool/packaging/ipk.py
+++ b/src/engine/SCons/Tool/packaging/ipk.py
@@ -169,7 +169,7 @@ Description: $X_IPK_DESCRIPTION
 
     #
     # close all opened files
-    for f in opened_files.values():
+    for f in list(opened_files.values()):
         f.close()
 
     # call a user specified function
diff --git a/src/engine/SCons/Tool/packaging/msi.py b/src/engine/SCons/Tool/packaging/msi.py
index c25f856..73d3567 100644
--- a/src/engine/SCons/Tool/packaging/msi.py
+++ b/src/engine/SCons/Tool/packaging/msi.py
@@ -172,7 +172,7 @@ def generate_guids(root):
 
     # find all XMl nodes matching the key, retrieve their attribute, hash their
     # subtree, convert hash to string and add as a attribute to the xml node.
-    for (key,value) in needs_id.items():
+    for (key,value) in list(needs_id.items()):
         node_list = root.getElementsByTagName(key)
         attribute = value
         for node in node_list:
@@ -335,7 +335,7 @@ def build_wxsfile_file_section(root, files, NAME, VERSION, VENDOR, filename_set,
             }
 
         # fill in the default tags given above.
-        for k,v in [ (k, v) for (k,v) in h.items() if not hasattr(file, k) ]:
+        for k,v in [ (k, v) for (k,v) in list(h.items()) if not hasattr(file, k) ]:
             setattr( file, k, v )
 
         File = factory.createElement( 'File' )
@@ -382,7 +382,7 @@ def build_wxsfile_features_section(root, files, NAME, VERSION, SUMMARY, id_set):
     Feature.attributes['Description']           = escape( SUMMARY )
     Feature.attributes['Display']               = 'expand'
 
-    for (feature, files) in create_feature_dict(files).items():
+    for (feature, files) in list(create_feature_dict(files).items()):
         SubFeature   = factory.createElement('Feature')
         SubFeature.attributes['Level'] = '1'
 
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index eac3c43..0931c77 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
@@ -269,7 +271,7 @@ def build_specfile_filesection(spec, files):
     for file in files:
         # build the tagset
         tags = {}
-        for k in supported_tags.keys():
+        for k in list(supported_tags.keys()):
             try:
                 v = file.GetTag(k)
                 if v:
@@ -330,7 +332,7 @@ class SimpleTagCompiler(object):
         international = [t for t in replacements if is_international(t[0])]
         for key, replacement in international:
             try:
-                x = [t for t in values.items() if strip_country_code(t[0]) == key]
+                x = [t for t in list(values.items()) if strip_country_code(t[0]) == key]
                 int_values_for_key = [(get_country_code(t[0]),t[1]) for t in x]
                 for v in int_values_for_key:
                     str = str + replacement % v