Hello community, here is the log from the commit of package switch_sles_sle-hpc for openSUSE:Factory checked in at 2018-09-14 00:02:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/switch_sles_sle-hpc (Old) and /work/SRC/openSUSE:Factory/.switch_sles_sle-hpc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "switch_sles_sle-hpc" Fri Sep 14 00:02:19 2018 rev:4 rq:635514 version:0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/switch_sles_sle-hpc/switch_sles_sle-hpc.changes 2018-08-31 10:45:14.895260467 +0200 +++ /work/SRC/openSUSE:Factory/.switch_sles_sle-hpc.new/switch_sles_sle-hpc.changes 2018-09-14 00:02:22.749908443 +0200 @@ -1,0 +2,6 @@ +Thu Sep 13 10:40:07 UTC 2018 - eich@suse.com + +- Make script work on non-x86_64 platforms: remove hard-coded + arch left over from testing. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ switch_sles_sle-hpc.spec ++++++ --- /var/tmp/diff_new_pack.crZheh/_old 2018-09-14 00:02:23.209908091 +0200 +++ /var/tmp/diff_new_pack.crZheh/_new 2018-09-14 00:02:23.213908089 +0200 @@ -17,7 +17,7 @@ Name: switch_sles_sle-hpc -Version: 0.1 +Version: 0.2 Release: 0 Summary: Utility to switch between SLES and SLE-HPC on SLE-12 License: MIT ++++++ switch ++++++ --- /var/tmp/diff_new_pack.crZheh/_old 2018-09-14 00:02:23.253908058 +0200 +++ /var/tmp/diff_new_pack.crZheh/_new 2018-09-14 00:02:23.253908058 +0200 @@ -127,9 +127,10 @@ } switch_to_sle_hpc() { - local regcode=$1 - local old_regcode=$2 - local error=$3 + local arch=$1 + local regcode=$2 + local old_regcode=$3 + local error=$4 [ -z "$error" ] && error=0 if [ $error -eq 0 ]; then echo "Switching to SLE-HPC" @@ -143,21 +144,22 @@ [ "$base_status" = "Registered" ] && { ${SUSECONNECT} --de-register 2>/dev/null || { [ $error -eq 0 ] && \ die "Cannot deregister product"; }; } rpm_e --nodeps sles-release || { echo "Cannot uninstall sles-release"; - switch_to_sles $old_regcode $regcode $error; return 1; } + switch_to_sles $arch $old_regcode $regcode $error; return 1; } rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch /etc/products.d/ [ $old ] && { rpm_e --nodeps patterns-sles-Minimal patterns-sles-base || \ - { echo "Cannot uninstall patterns"; switch_to_sles $old_regcode $regcode $error; return 1; }; } - ${SUSECONNECT} -p SLE-HPC/12.${SP}/x86_64 -r ${regcode} -e ${email} || \ - { echo "Cannot register SLE-HPC"; switch_to_sles $old_regcode $regcode $error; return 1; } + { echo "Cannot uninstall patterns"; switch_to_sles $arch $old_regcode $regcode $error; return 1; }; } + ${SUSECONNECT} -p SLE-HPC/12.${SP}/${arch} -r ${regcode} -e ${email} || \ + { echo "Cannot register SLE-HPC"; switch_to_sles $arch $old_regcode $regcode $error; return 1; } ln -sf SLE-HPC.prod /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch /etc/products.d/ [ $old ] && zypp_in patterns-sle-hpc-Minimal patterns-sles-base return 0 } switch_to_sles() { - local regcode=$1 - local old_regcode=$2 - local error=$3 + local arch=$1 + local regcode=$2 + local old_regcode=$3 + local error=$4 [ -z "$error" ] && error=0 if [ $error -eq 0 ]; then echo "Switching to SLES" @@ -171,10 +173,10 @@ [ "$base_status" = "Registered" ] && { ${SUSECONNECT} --de-register 2>/dev/null || { [ $error -eq 0 ] && \ die "Cannot deregister product"; }; } rpm_e --nodeps SLE-HPC-release SLE-HPC-release-POOL || { echo "Cannot uninstall SLE-HPC-release"; \ - switch_to_sle_hpc $old_regcode $regcode $error; return 1; } + switch_to_sle_hpc $arch $old_regcode $regcode $error; return 1; } rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch /etc/products.d/ - ${SUSECONNECT} -p SLES/12.${SP}/x86_64 -r ${regcode} -e ${email} || \ - { echo "Cannot register SLES"; switch_to_sle_hpc $old_regcode $regcode $error; return 1; } + ${SUSECONNECT} -p SLES/12.${SP}/${arch} -r ${regcode} -e ${email} || \ + { echo "Cannot register SLES"; switch_to_sle_hpc $arch $old_regcode $regcode $error; return 1; } ln -sf SLES.prod /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch /etc/products.d/ [ $old ] && rpm_e --nodeps patterns-sle-hpc-Minimal [ $old ] && zypp_in patterns-sles-Minimal @@ -327,7 +329,7 @@ msg="" declare -i ret=0 deregister_modules_extensions "$suseconnect" ${TYPE} -$func $regcode $base_reg 0 || { msg="Registration of $target failed, please check your reg-code and messages above.\n$TYPE restored\n."; ret=1; } +$func $base_arch $regcode $base_reg 0 || { msg="Registration of $target failed, please check your reg-code and messages above.\n$TYPE restored\n."; ret=1; } reregister_modules_extensions "$suseconnect" ${TYPE} echo -en "$msg" exit $ret