Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2021-02-08 11:47:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dpkg (Old) and /work/SRC/openSUSE:Factory/.dpkg.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg" Mon Feb 8 11:47:06 2021 rev:31 rq:868974 version:1.19.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2019-04-05 11:55:59.726308129 +0200 +++ /work/SRC/openSUSE:Factory/.dpkg.new.28504/update-alternatives.changes 2021-02-08 11:47:09.993684639 +0100 @@ -1,0 +2,6 @@ +Thu Jan 14 09:33:00 UTC 2021 - Ludwig Nussel <[email protected]> + +- don't remove slave links that turned into master. Happens on usrmerge + (boo#1180939, update-alternatives-slavetomaster.patch) + +------------------------------------------------------------------- New: ---- update-alternatives-slavetomaster.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dpkg.spec ++++++ --- /var/tmp/diff_new_pack.EGvJeO/_old 2021-02-08 11:47:10.765685890 +0100 +++ /var/tmp/diff_new_pack.EGvJeO/_new 2021-02-08 11:47:10.769685896 +0100 @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ update-alternatives.spec ++++++ --- /var/tmp/diff_new_pack.EGvJeO/_old 2021-02-08 11:47:10.801685948 +0100 +++ /var/tmp/diff_new_pack.EGvJeO/_new 2021-02-08 11:47:10.805685955 +0100 @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor Patch0: update-alternatives-suse.patch +Patch1: update-alternatives-slavetomaster.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -45,8 +46,7 @@ particular preference. %prep -%setup -q -n dpkg-%{version} -%patch0 -p1 +%autosetup -p1 -n dpkg-%{version} %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects ++++++ update-alternatives-slavetomaster.patch ++++++ Index: dpkg-1.19.0.5/utils/update-alternatives.c =================================================================== --- dpkg-1.19.0.5.orig/utils/update-alternatives.c +++ dpkg-1.19.0.5/utils/update-alternatives.c @@ -1796,7 +1796,10 @@ alternative_prepare_install(struct alter /* Drop unused slave. */ fn = xasprintf("%s/%s", altdir, sl->name); if (alternative_path_can_remove(sl->link)) - alternative_add_commit_op(a, OPCODE_RM, sl->link, NULL); + if (strcmp(sl->link, a->master_link)) + alternative_add_commit_op(a, OPCODE_RM, sl->link, NULL); + else + warning("not removing %s, now master", a->master_link); else warning(_("not removing %s since it's not a symlink"), sl->link);
