Merge pull request #5944 from liulinC/private/linl/dev

xapi-project · Aug 20, 2024 · 09603bd · 09603bd
2 parents a5d13be + bdf5268
commit 09603bd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/ocaml/message-switch/core_test/interop-test.sh b/ocaml/message-switch/core_test/interop-test.sh
diff --git a/scripts/generate-iscsi-iqn b/scripts/generate-iscsi-iqn
@@ -36,7 +36,7 @@ geniqn() {
         domain=${defaultdomain}
     fi
 
-    revdomain=$(python -c "${REVERSE_PY}" $domain)
+    revdomain=$(python3 -c "${REVERSE_PY}" $domain)
 
     uuid=$(uuidgen | cut -d- -f1)
     date=$(date +"%Y-%m")

diff --git a/scripts/xe-backup-metadata b/scripts/xe-backup-metadata
@@ -51,7 +51,7 @@ function usage {
 function uuid5 {
   # could use a modern uuidgen but it's not on XS 8
   # should work with Python 2 and 3
-  python -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
+  python3 -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
 }
 
 function test_sr {

diff --git a/scripts/xe-restore-metadata b/scripts/xe-restore-metadata
@@ -65,7 +65,7 @@ function test_sr {
 NS="e93e0639-2bdb-4a59-8b46-352b3f408c19"
 function uuid5 {
   # could use a modern uuidgen but it's not on XS 8
-  python -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
+  python3 -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
 }
 
 dry_run=0