testing/dpkg
SHA256
3
0
Fork 0
forked from pool/dpkg
Code Pull Requests Activity

Accepting request 868974 from system:packagemanager

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/868974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2021-02-08 10:47:06 +00:00 committed by Git OBS Bridge
commit 9864a7a79b
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dpkg.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dpkg # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

16
update-alternatives-slavetomaster.patch Normal file
View File

@ -0,0 +1,16 @@
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);

6
update-alternatives.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 14 09:33:00 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- don't remove slave links that turned into master. Happens on usrmerge
(boo#1180939, update-alternatives-slavetomaster.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 2 20:04:25 UTC 2019 - Andreas Schwab <schwab@suse.de> Tue Apr 2 20:04:25 UTC 2019 - Andreas Schwab <schwab@suse.de>

6
update-alternatives.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package update-alternatives # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,6 +26,7 @@ URL: http://ftp.de.debian.org/debian/pool/main/d/dpkg/
Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz
Source3: sensible-editor Source3: sensible-editor
Patch0: update-alternatives-suse.patch Patch0: update-alternatives-suse.patch
Patch1: update-alternatives-slavetomaster.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
@ -45,8 +46,7 @@ make a good choice of editor to invoke if the user has not specified a
particular preference. particular preference.
%prep %prep
%setup -q -n dpkg-%{version} %autosetup -p1 -n dpkg-%{version}
%patch0 -p1
%build %build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %global _lto_cflags %{_lto_cflags} -ffat-lto-objects