Hello community,
here is the log from the commit of package switch_sles_sle-hpc for
openSUSE:Factory checked in at 2018-08-24 17:10:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Aug 24 17:10:51 2018 rev:2 rq:631043 version:0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/switch_sles_sle-hpc/switch_sles_sle-hpc.changes
2018-08-18 00:04:58.303231321 +0200
+++
/work/SRC/openSUSE:Factory/.switch_sles_sle-hpc.new/switch_sles_sle-hpc.changes
2018-08-24 17:10:51.958553635 +0200
@@ -1,0 +2,6 @@
+Thu Aug 23 07:54:58 UTC 2018 - [email protected]
+
+- Improve Error handling - make sure modules & extensions are restored.
+- Improve messaging.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ switch ++++++
--- /var/tmp/diff_new_pack.uYLzbO/_old 2018-08-24 17:10:52.294554035 +0200
+++ /var/tmp/diff_new_pack.uYLzbO/_new 2018-08-24 17:10:52.294554035 +0200
@@ -140,15 +140,15 @@
fi
let $(( ++error ))
- [ "$base_status" = "Registered" ] && { ${SUSECONNECT} --de-register || { [
$error -eq 0 ] && \
+ [ "$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; exit 1; }
+ switch_to_sles $old_regcode $regcode $error; return 1; }
rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch
/etc/products.d/
[ $old ] && { rpm_e patterns-sles-Minimal patterns-sles-base || \
- { echo "Cannot uninstall patterns"; switch_to_sles $old_regcode
$regcode $error; exit 1; }; }
+ { 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; exit 1; }
+ { echo "Cannot register SLE-HPC"; switch_to_sles $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
@@ -168,13 +168,13 @@
fi
let $(( ++error ))
- [ "$base_status" = "Registered" ] && { ${SUSECONNECT} --de-register || { [
$error -eq 0 ] && \
+ [ "$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; exit 1; }
+ switch_to_sle_hpc $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; exit 1; }
+ { echo "Cannot register SLES"; switch_to_sle_hpc $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
@@ -301,17 +301,17 @@
You have not supplied a registration code to register $target.
It is possible to reuse the registration code of your
-current subscription if this is valid to register $target.
-This is generally the case for codes valid for a SLES subscription.
+current subscription if this is also valid for $target.
+This is usually the case for codes valid for a SLES subscription.
EOF
if [ "$target" = "SLE-HPC" ]
then
cat <<EOF
-If you wish to change your registration to SLE-HPC please
-provide a new key by calling:
+If you wish to change your registration key for SLE-HPC please
+provide a new key using the '-r' option.
+For details check 'man 8 switch_sles_sle-hpc'.
EOF
- usage
fi
read -p "Do you whish to reuse the $TYPE registration key? [y|N]:" answ
[ "$answ" = "y" -o "$answ" = "Y" ] || exit
@@ -324,6 +324,10 @@
log "$suseconnect"
+msg=""
+declare -i ret=0
deregister_modules_extensions "$suseconnect" ${TYPE}
-$func $regcode $base_reg 0
+$func $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
