distro.linux_distribution() is deprecated, change it

DeprecationWarning: distro.linux_distribution() is deprecated.
It should only be used as a compatibility shim with Python's platform.linux_distribution().
 Please use distro.id(), distro.version() and distro.name() instead.

Change-Id: Ibae719b5cb4e7bfce2a0e098e4e6bc0504f7ecc1
Signed-off-by: wang biao <biao716.wang@samsung.com>

diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case
index f487d930c678d89ba521a34f1973ddbfcfd04ad8..7fd4ec25b862570b087b0c65cfc6eeb45233b5e6 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw.case
+++ b/cases/create/func_cases/mic_cr_auto_raw.case
@@ -47,7 +47,7 @@ sudo bunzip2 -d mic-output/$bz2img
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -57,8 +57,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if [ "$platform"="openSUSE" ] && [ "$version"=42.3 ]; then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
@@ -119,9 +119,8 @@ do
         test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
         test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
         kpartx_path=$(sudo which kpartx)
-        linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-        platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-        version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+        platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+        version=$(python3 -c 'import distro;print(distro.version().rstrip())')
         if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
             echo 'This is openSUSE42.3 platform.'
         else

diff --git a/cases/create/func_cases/mic_cr_auto_raw_gpt.case b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
index 571e325e595418367cfbd5196bed3a244a17e808..42dd9994c0178b1321defa4d88239347cebc4a12 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw_gpt.case
+++ b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
@@ -26,7 +26,7 @@ sudo bunzip2 -d mic-output/$bz2img
 raw_image=$(ls mic-output/ivi_with_installerfw-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -36,8 +36,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
@@ -95,8 +95,8 @@ do
         test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
         kpartx_path=$(sudo which kpartx)
         linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-        platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-        version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+        platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+        version=$(python3 -c 'import distro;print(distro.version().rstrip())')
         if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
             echo 'This is openSUSE42.3 platform.'
         else

diff --git a/cases/create/mixed_cases/mic_cr_createrepo_issue.case b/cases/create/mixed_cases/mic_cr_createrepo_issue.case
index 933ec3ee6429045cc0b1bb1cf7c67928febdf918..8336a2dfb919bd3a93912a1eedbb5d14d3c785f8 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_createrepo_issue.case
+++ b/cases/create/mixed_cases/mic_cr_createrepo_issue.case
@@ -17,7 +17,7 @@ createrepo --version || True
 #export ftp_proxy="ftp://10.112.1.184:8080"
 #export socks_proxy="socks://10.112.1.184:8080"
 export no_proxy="localhost, 127.0.0.1, 10.113.136.113, ftp.kr.debian.org, 109.123.123.185, 10.113.136.26"
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "opensuse" ]; then
  sudo zypper install -y --oldpackage createrepo_c-0.10.4

diff --git a/cases/create/mixed_cases/mic_cr_raw_active_partition.case b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
index 8545bd30bf91b7cd425811e571873bcf2a51a619..554465594144dd07a754dba3a915bef93d6f3410 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_active_partition.case
+++ b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
@@ -21,7 +21,7 @@ cd mic-output/
 raw_name=$(ls ivi_with_active_partition-*-sdb.raw)
 test -f $raw_name
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -31,8 +31,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     echo 'This is openSUSE42.3 platform.'
 else
@@ -45,8 +45,8 @@ parted_path=$(sudo which parted)
 parted_boot_output=$(sudo $parted_path  $raw_name print| grep 'boot' | awk '{print $1}')
 test  $blkid_output -eq $parted_boot_output
 linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
     echo 'This is openSUSE42.3 platform.'
 elif [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then

diff --git a/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case b/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case
index f91aa8e02cb2a75d2188dcb89594f65fd0fe8458..483032937e41ceaa85178941b3d822631393cf05 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case
+++ b/cases/create/mixed_cases/mic_cr_raw_installerfw_extlinux.case
@@ -10,7 +10,7 @@
 python3 repo_parse.py ivi_with_installerfw.ks repo_config.json ivi-profile
 python3 repo_parse.py ivi_syslinux_problem.ks repo_config.json syslinux_problem_rep-profile
 platform=$(uname -m)
-distro=$(python3 -c "import distro;print(distro.linux_distribution()[0].lower().rstrip())")
+distro=$(python3 -c "import distro;print(distro.name().lower().rstrip())")
 if [ "$platform" == "x86_64" ] || [ "$distro" == "centos" ]
 then
     losetup_path=$(sudo which losetup)

diff --git a/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case b/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case
index 7cd3e0f8daf17bd72ab4c2e924796c74f4a0be23..80d54c04703aafa62f8b3b7617cd96ab8f7fa2a1 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case
+++ b/cases/create/mixed_cases/mic_cr_raw_ivi_partition_size_compute_ia32.case
@@ -13,7 +13,7 @@ python3 repo_parse.py ivi_624.ks repo_config.json ivi-profile
 losetup_path=$(sudo which losetup)
 sudo $losetup_path -a
 loop_used_before=$(sudo $losetup_path -a | wc -l)
-distro=`python3 -c "import distro;a=distro.linux_distribution();print(a[0])"`
+distro=$(python3 -c 'import distro;print(distro.name().rstrip())')
 sudo mic -d -v cr raw ivi_624.ks --logfile=./log/handset.log 
 test -f ./log/handset.log
 grep 'Finished' ./log/handset.log

diff --git a/cases/create/mixed_cases/mic_cr_raw_locale.case b/cases/create/mixed_cases/mic_cr_raw_locale.case
index 88236a1966facc68d04ff9dbbbee2a7b2a4ec52c..65173b67ba21a4df608eb6e83cc5613f9c61986e 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_locale.case
+++ b/cases/create/mixed_cases/mic_cr_raw_locale.case
@@ -26,7 +26,7 @@ fi
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -36,8 +36,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
@@ -89,9 +89,9 @@ if [ -f $raw_image ];then
     test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
     test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
     kpartx_path=$(sudo which kpartx)
-    linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-    platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-    version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+    linux_distro=$(python3 -c 'import distro; a=(distro.name(), distro.version()); print(a)')
+    platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+    version=$(python3 -c 'import distro;print(distro.version().rstrip())')
     if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
         echo 'This is openSUSE42.3 platform.'
     elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
index 39710676e0af3651a2c9b6544e6cd59b7e000fe0..6a25acbe759389e74095537e8f66f98e0147a2a1 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
@@ -22,7 +22,7 @@ fi
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -32,8 +32,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(platform.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(platform.version().rstrip())')
 if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
@@ -84,9 +84,9 @@ if [ -f $raw_image ];then
     test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
     test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
     kpartx_path=$(sudo which kpartx)
-    linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-    platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-    version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+    linux_distro=$(python3 -c 'import distro; a=(distro.name(), distro.version()); print(a)')
+    platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+    version=$(python3 -c 'import distro;print(distro.version().rstrip())')
     if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
         echo 'This is openSUSE42.3 platform.'
     elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
index 7f1dddf9bda5eaf69a6d5cd5f7be0c4112e067e0..45bd570eb4cfd5b9cb65d286c956783f11fae650 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
@@ -22,7 +22,7 @@ fi
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
-distro=$(python3 -c 'import distro;print(distro.linux_distribution()[0].lower().rstrip())')
+distro=$(python3 -c 'import distro;print(distro.name().lower().rstrip())')
 echo $distro
 if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     modprobe_path=$(sudo which modprobe)
@@ -32,8 +32,8 @@ if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
     sudo $rmmod_path loop
 fi
 
-platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+version=$(python3 -c 'import distro;print(distro.version().rstrip())')
 if ([ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]) || ([ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]); then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
@@ -86,8 +86,8 @@ if [ -f $raw_image ];then
     test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
     kpartx_path=$(sudo which kpartx)
     linux_distro=$(python3 -c 'import distro; print(distro.linux_distribution());')
-    platform=$(python3 -c 'import distro;print(distro.linux_distribution()[0].rstrip())')
-    version=$(python3 -c 'import distro;print(distro.linux_distribution()[1].rstrip())')
+    platform=$(python3 -c 'import distro;print(distro.name().rstrip())')
+    version=$(python3 -c 'import distro;print(distro.version().rstrip())')
     if [ "$platform" = "openSUSE" ] && [ "$version" = "42.3" ]; then
         echo 'This is openSUSE42.3 platform.'
     elif [ "$platform" = "Ubuntu" ] && [ "$version" = "20.04" ]; then