Attachment 8651 Details for Bug 12361 – prevent wanted packages to be later removed

[patch] prevent wanted packages to be later removed

0001-prevent-wanted-packages-to-be-later-removed.patch (text/plain), 1.93 KB, created by Thierry Vignaud on 2016-11-12 08:55:47 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-11-12 08:55:47 CET

Size: 1.93 KB

patch

obsolete

>From 4bd3427100a81c377a42511aecfb1c007701057e Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Sat, 12 Nov 2016 08:48:51 +0100
>Subject: [PATCH] prevent wanted packages to be later removed
>
>aka tell urpme --auto-orphan to not consider wanted packages
>We want them to be both keeped by draklive-install _and_ urpme
>---
> perl-install/pkgs.pm | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
>index c4d25a5..e9de68c 100644
>--- a/perl-install/pkgs.pm
>+++ b/perl-install/pkgs.pm
>@@ -253,6 +253,14 @@ sub detect_unselected_locale_packages {
>     $do_pkgs->are_installed(@unneeded_locales);
> }
> 
>+sub mark_packages_as_wanted {
>+    my ($do_pkgs, $o_prefix, @wanted_hardware_packages) = @_;
>+    # only consider those that are actually installed:
>+    @wanted_hardware_packages = $do_pkgs->are_installed(@wanted_hardware_packages);
>+    # tell urpme --auto-orphans to never consider them:
>+    run_program::rooted($o_prefix, 'urpmi', @wanted_hardware_packages);
>+}
>+
> sub remove_unused_packages {
>     my ($in, $do_pkgs, $o_prefix) = @_;
> 
>@@ -267,6 +275,7 @@ sub remove_unused_packages {
>     # Packages to not remove even if they seem unused
>     my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wireless-regdb wpa_supplicant iw crda kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode b43-fwcutter b43-openfwwf atmel-firmware speedtouch-firmware zd1211-firmware isdn4k-utils rfkill x11-driver-input-wacom usb_modeswitch usb_modeswitch-data);
>     @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages);
>+    mark_packages_as_wanted($do_pkgs, $o_prefix, @wanted_hardware_packages);
> 
>     @unused_hardware_packages || @unselected_locales or return;
> 
>-- 
>2.10.2
>

From 4bd3427100a81c377a42511aecfb1c007701057e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 12 Nov 2016 08:48:51 +0100
Subject: [PATCH] prevent wanted packages to be later removed

aka tell urpme --auto-orphan to not consider wanted packages
We want them to be both keeped by draklive-install _and_ urpme
---
 perl-install/pkgs.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index c4d25a5..e9de68c 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -253,6 +253,14 @@ sub detect_unselected_locale_packages {
     $do_pkgs->are_installed(@unneeded_locales);
 }
 
+sub mark_packages_as_wanted {
+    my ($do_pkgs, $o_prefix, @wanted_hardware_packages) = @_;
+    # only consider those that are actually installed:
+    @wanted_hardware_packages = $do_pkgs->are_installed(@wanted_hardware_packages);
+    # tell urpme --auto-orphans to never consider them:
+    run_program::rooted($o_prefix, 'urpmi', @wanted_hardware_packages);
+}
+
 sub remove_unused_packages {
     my ($in, $do_pkgs, $o_prefix) = @_;
 
@@ -267,6 +275,7 @@ sub remove_unused_packages {
     # Packages to not remove even if they seem unused
     my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wireless-regdb wpa_supplicant iw crda kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode b43-fwcutter b43-openfwwf atmel-firmware speedtouch-firmware zd1211-firmware isdn4k-utils rfkill x11-driver-input-wacom usb_modeswitch usb_modeswitch-data);
     @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages);
+    mark_packages_as_wanted($do_pkgs, $o_prefix, @wanted_hardware_packages);
 
     @unused_hardware_packages || @unselected_locales or return;
 
-- 
2.10.2

Actions: View | Diff

Attachments on bug 12361: 8649 | 8650 | 8651 | 8652