Hello community,
here is the log from the commit of package switch_sles_sle-hpc for openSUSE:Factory checked in at 2019-03-10 09:39:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/switch_sles_sle-hpc (Old)
and /work/SRC/openSUSE:Factory/.switch_sles_sle-hpc.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "switch_sles_sle-hpc"
Sun Mar 10 09:39:46 2019 rev:5 rq:682805 version:0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/switch_sles_sle-hpc/switch_sles_sle-hpc.changes 2018-09-14 00:02:22.749908443 +0200
+++ /work/SRC/openSUSE:Factory/.switch_sles_sle-hpc.new.28833/switch_sles_sle-hpc.changes 2019-03-10 09:39:56.860110545 +0100
@@ -1,0 +2,13 @@
+Fri Mar 8 09:37:19 UTC 2019 - Egbert Eich
+
+- Fix case where base product is not found because zypper cache hasn't
+ been updated: Remove zypper cookie instead of touching /etc/products.d
+ (bsc#1128494).
+
+-------------------------------------------------------------------
+Thu Mar 7 19:49:58 UTC 2019 - Egbert Eich
+
+- Fix script name switch_to_sle-hpc -> switch_sles_sle_hpc keep old name
+ as link (bsc#1128381).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ switch_sles_sle-hpc.spec ++++++
--- /var/tmp/diff_new_pack.jt4iwk/_old 2019-03-10 09:39:57.784110324 +0100
+++ /var/tmp/diff_new_pack.jt4iwk/_new 2019-03-10 09:39:57.784110324 +0100
@@ -1,7 +1,7 @@
#
# spec file for package switch_sles_sle-hpc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -46,7 +46,8 @@
%build
%install
-install -D -m 0755 %{S:0} %{buildroot}%{_sbindir}/switch_to_sle-hpc
+install -D -m 0755 %{S:0} %{buildroot}%{_sbindir}/switch_sles_sle-hpc
+ln -s %{_sbindir}/switch_sles_sle-hpc %{buildroot}%{_sbindir}/switch_to_sle-hpc
install -D -m 0644 %{S:3} %{buildroot}%{_mandir}/man8/%{basename:%{S:3}}
%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320
@@ -60,6 +61,7 @@
%my_license LICENSE
%doc README.SUSE
%{_sbindir}/switch_to_sle-hpc
+%{_sbindir}/switch_sles_sle-hpc
%{_mandir}/man8/*
%changelog
++++++ switch ++++++
--- /var/tmp/diff_new_pack.jt4iwk/_old 2019-03-10 09:39:57.824110314 +0100
+++ /var/tmp/diff_new_pack.jt4iwk/_new 2019-03-10 09:39:57.824110314 +0100
@@ -145,12 +145,12 @@
die "Cannot deregister product"; }; }
rpm_e --nodeps sles-release || { echo "Cannot uninstall sles-release";
switch_to_sles $arch $old_regcode $regcode $error; return 1; }
- rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && touch /etc/products.d/
+ rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && rm -f /var/cache/zypp/solv/@System/cookie
[ $old ] && { rpm_e --nodeps patterns-sles-Minimal patterns-sles-base || \
{ 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/
+ ln -sf SLE-HPC.prod /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && rm -rf /var/cache/zypp/solv/@System/cookie
[ $old ] && zypp_in patterns-sle-hpc-Minimal patterns-sles-base
return 0
}
@@ -174,10 +174,10 @@
die "Cannot deregister product"; }; }
rpm_e --nodeps SLE-HPC-release SLE-HPC-release-POOL || { echo "Cannot uninstall SLE-HPC-release"; \
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/
+ rm -f /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && rm -rf /var/cache/zypp/solv/@System/cookie
${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/
+ ln -sf SLES.prod /etc/products.d/baseproduct; [ -d /etc/products.d/ ] && rm -rf /var/cache/zypp/solv/@System/cookie
[ $old ] && rpm_e --nodeps patterns-sle-hpc-Minimal
[ $old ] && zypp_in patterns-sles-Minimal
return 0
@@ -275,7 +275,8 @@
[ "$TYPE" = "SLES" -o "$TYPE" = "SLE-HPC" ] || die "only for SLES or SLE-HPC"
[ $SP -lt 4 ] && old=1
-if [ "$(basename $0)" = "switch_to_sle-hpc" ]
+if [ "$(basename $0)" = "switch_sles_sle-hpc" -o \
+ "$(basename $0)" = "switch_to_sle-hpc" ]
then
if [ "$TYPE" = "SLES" ]; then
target="SLE-HPC"
@@ -283,7 +284,8 @@
else
die "Already SLE-HPC"
fi
-elif [ "$(basename $0)" = "switch_to_sles" ]
+elif [ "$(basename $0)" = "switch_sle-hpc_sles" -o \
+ "$(basename $0)" = "switch_to_sles" ]
then
if [ "$TYPE" = "SLE-HPC" ]; then
target="SLES"
