From 164dc73ec35a3114b1472d6b2b8c3c13a48fe339 Mon Sep 17 00:00:00 2001
From: Thibaut ROMAIN <thibaut.romain@cs-soprasteria.com>
Date: Tue, 15 Oct 2024 11:10:12 +0200
Subject: [PATCH] COMP: fix merge typos
---
.../Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx | 3 +--
Packaging/Files/post_install.sh.in | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
index 837d3c3cac..881a83e363 100644
--- a/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
+++ b/Modules/Core/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
@@ -149,8 +149,7 @@ CommandLineParser::ParseResultType CommandLineParser::GetPaths(std::vector<std::
if (tempModPath.size() > 0)
{
- std::vector<std::string> pathAttribut = itksys::SystemTools::SplitString(tempModPath, ' ', false);
-
+ std::vector<std::string> pathAttribute = itksys::SystemTools::SplitString(tempModPath, ' ', false);
// Remove " " string element
for (unsigned int i = 0; i < pathAttribute.size(); i++)
diff --git a/Packaging/Files/post_install.sh.in b/Packaging/Files/post_install.sh.in
index 2bc30f2c72..c84d73f340 100644
--- a/Packaging/Files/post_install.sh.in
+++ b/Packaging/Files/post_install.sh.in
@@ -35,18 +35,17 @@ sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/gdal-co
sed -i "s/\/builds\/otb\/xdk/\$OTB_INSTALL_DIR/g" "$OTB_INSTALL_DIR"/bin/curl-config
sh "$OTB_INSTALL_DIR"/tools/sanitize_rpath.sh
-# Check python version, if python 3.10 (ubuntu 22 and debian 12) download and extract the gdal bindings for python 3.10
+# Check python version, if python 3.12 (ubuntu 24 and debian > 12) download and extract the gdal bindings for python 3.12
pyversion="$(python3 -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]*\).*/\1\2/')"
if [ "$pyversion" = "312" ]; then
echo "***** Python 3.12 detected, downloading gdal bindings compiled for python 3.12 *****"
- PACKAGE_OTB_VERSION="$OTB_SHORT_VERSION.@OTB_VERSION_PATCH@"
HTTP_STATUS=$(curl -s -o "$OTB_INSTALL_DIR"/tools/py312.tar.gz -w "%{response_code}\n" https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz)
if [ $HTTP_STATUS -eq 200 ]; then
tar -xf "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz -C "$OTB_INSTALL_DIR"/lib/python3/dist-packages/osgeo/
rm "$OTB_INSTALL_DIR"/tools/gdal-py312.tar.gz
echo "*** GDAL bindings for python 3.12 successfully installed ***"
else
- echo "Can not find GDAL bindings at https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-9.1-GDAL-bindings-py$pyversion.tar.gz"
+ echo "Can not find GDAL bindings at https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-$OTB_SHORT_VERSION-GDAL-bindings-py$pyversion.tar.gz"
return -1
fi
sh "$OTB_INSTALL_DIR"/recompile_bindings.sh
--
GitLab