[Libreoffice-commits] core.git: solenv/gbuild

[Jochen Nitschke]

 solenv/gbuild/gen-autoinstall.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ddf8539d97ce044b7df8d51d6ec72ec864b40fb8
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Jun 4 21:36:50 2017 +0200

    fix packaging with python 2.6
    
    set literal syntax was introduced in python 3
    and backported to 2.7 later
    
    Change-Id: I4ddf76729de425ba93daf5c287969dacabcee01d
    Reviewed-on: https://gerrit.libreoffice.org/38393
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 117cbd2b5f02..b331638e7f5e 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -73,25 +73,25 @@ print(", \\\n".join(["    " + gid for gid in allgids]))
 for (gid, link, target) in autosdklibs:
     print("SDK_LIBRARY_LINK(" + gid + "," + link + "," + target + ")")
 
-scp2libtemplates = { "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_LIB_FILE_COMPONENTCONDITION" }
+scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_LIB_FILE_COMPONENTCONDITION" ])
 for (gid, libfile) in autolibs:
     if not(scp2libtemplate in scp2libtemplates):
         raise Exception("invalid scp2libtemplate \"" + scp2libtemplate + "\"")
     print(scp2libtemplate + "(" + gid + "," + libfile + scp2componentcondition + ")")
 
-scp2exetemplates = { "URE_EXECUTABLE", "LIBO_EXECUTABLE", "LIBO_EXECUTABLE_COMPONENTCONDITION", "SDK_EXECUTABLE" }
+scp2exetemplates = set([ "URE_EXECUTABLE", "LIBO_EXECUTABLE", "LIBO_EXECUTABLE_COMPONENTCONDITION", "SDK_EXECUTABLE" ])
 for (gid, exefile) in autoexes:
     if not(scp2exetemplate in scp2exetemplates):
         raise Exception("invalid scp2exetemplate \"" + scp2exetemplate + "\"")
     print(scp2exetemplate + "(" + gid + "," + exefile + scp2componentcondition + ")")
 
-scp2jartemplates = { "URE_JAR_FILE", "LIBO_JAR_FILE" }
+scp2jartemplates = set([ "URE_JAR_FILE", "LIBO_JAR_FILE" ])
 for (gid, jarfile) in autojars:
     if not(scp2jartemplate in scp2jartemplates):
         raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
     print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
 
-scp2pkgtemplates = { "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" }
+scp2pkgtemplates = set([ "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" ])
 for (gid, pkgfilelist) in autopkgs:
     if not(scp2pkgtemplate in scp2pkgtemplates):
         raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")