|
diff -Naur condor-8.6.11.origin/configure_redhat condor-8.6.11/configure_redhat |
|
--- condor-8.6.11.origin/configure_redhat 2018-05-10 18:39:02.000000000 +0200 |
|
+++ condor-8.6.11/configure_redhat 2018-06-06 00:57:27.391013943 +0200 |
|
@@ -20,11 +20,12 @@ |
|
-DHAVE_HIBERNATION:BOOL=TRUE \ |
|
-DWANT_LEASE_MANAGER:BOOL=FALSE \ |
|
-DWANT_CONTRIB:BOOL=ON \ |
|
+ -DWITH_KRB5:BOOL=FALSE \ |
|
-DWANT_MAN_PAGES:BOOL=TRUE \ |
|
-DWANT_FULL_DEPLOYMENT:BOOL=FALSE \ |
|
-DWANT_GLEXEC:BOOL=FALSE \ |
|
-D_VERBOSE:BOOL=TRUE \ |
|
-DBUILDID:STRING=RH_development \ |
|
- -DWITH_GLOBUS:BOOL=FALSE \ |
|
+ -DWITH_GLOBUS:BOOL=TRUE \ |
|
-DWITH_VOMS:BOOL=FALSE \ |
|
-DCMAKE_INSTALL_PREFIX:PATH=${PWD}/release_dir "$@" |
|
diff -Naur condor-8.6.11.origin/src/python-bindings/classad_python_user.cpp condor-8.6.11/src/python-bindings/classad_python_user.cpp |
|
--- condor-8.6.11.origin/src/python-bindings/classad_python_user.cpp 2018-05-10 18:39:02.000000000 +0200 |
|
+++ condor-8.6.11/src/python-bindings/classad_python_user.cpp 2018-06-05 21:23:32.276135706 +0200 |
|
@@ -48,7 +48,7 @@ |
|
{ |
|
if (!Py_IsInitialized()) |
|
{ |
|
- char pname[] = "htcondor"; |
|
+ wchar_t pname[] = L"htcondor"; |
|
Py_SetProgramName(pname); |
|
Py_InitializeEx(0); |
|
} |
|
diff -Naur condor-8.6.11.origin/src/python-bindings/collector.cpp condor-8.6.11/src/python-bindings/collector.cpp |
|
--- condor-8.6.11.origin/src/python-bindings/collector.cpp 2018-05-10 18:39:02.000000000 +0200 |
|
+++ condor-8.6.11/src/python-bindings/collector.cpp 2018-06-05 21:23:32.280135823 +0200 |
|
@@ -79,7 +79,7 @@ |
|
m_collectors = CollectorList::create(); |
|
m_default = true; |
|
} |
|
- else if (PyString_Check(pool.ptr()) || PyUnicode_Check(pool.ptr())) |
|
+ else if (PyBytes_Check(pool.ptr()) || PyUnicode_Check(pool.ptr())) |
|
{ |
|
std::string pool_str = boost::python::extract<std::string>(pool); |
|
if (pool_str.size()) |
|
diff -Naur condor-8.6.11.origin/src/python-bindings/collector_plugin.cpp condor-8.6.11/src/python-bindings/collector_plugin.cpp |
|
--- condor-8.6.11.origin/src/python-bindings/collector_plugin.cpp 2018-05-10 18:39:02.000000000 +0200 |
|
+++ condor-8.6.11/src/python-bindings/collector_plugin.cpp 2018-06-05 21:23:32.284135940 +0200 |
|
@@ -69,7 +69,7 @@ |
|
{ |
|
if (!Py_IsInitialized()) |
|
{ |
|
- char pname[] = "condor_collector"; |
|
+ wchar_t pname[] = L"condor_collector"; |
|
Py_SetProgramName(pname); |
|
Py_InitializeEx(0); |
|
} |