Attachment 835311 Details for Bug 1040530 – patch!

[patch] patch!

diff (text/plain), 1.81 KB, created by Bill Nottingham on 2013-12-11 15:16:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2013-12-11 15:16:02 UTC

Size: 1.81 KB

patch

obsolete

>commit 4971facfb01815cb804ef044faae9557b0c2551a (HEAD, rhel7-branch)
>Author: Bill Nottingham <notting@redhat.com>
>Date:   Wed Dec 11 10:15:24 2013 -0500
>
>    Remove enablement of whiteout/blackout plugins, and the requires on anaconda-yum-plugins.
>    
>    1) blackout is for removing packages on upgrades. Upgrades no longer run
>    through anaconda.
>    2) The metadata introduced to service these plugins has
>    not undergone a single substantive, intentional update since Fedora 10.
>    
>    Therefore, I am left to assume that their functionality is vestigial and
>    should be removed. They'd be obsolete in a DNF world anyway.
>
>diff --git a/anaconda.spec.in b/anaconda.spec.in
>index 8159721..640aa69 100644
>--- a/anaconda.spec.in
>+++ b/anaconda.spec.in
>@@ -120,7 +120,6 @@ Requires: yum-utils >= %{yumutilsver}
> Requires: NetworkManager >= %{nmver}
> Requires: nm-connection-editor
> Requires: dhclient
>-Requires: anaconda-yum-plugins
> Requires: kbd
> Requires: chrony
> Requires: ntpdate
>diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
>index e077a49..37a0436 100644
>--- a/pyanaconda/packaging/yumpayload.py
>+++ b/pyanaconda/packaging/yumpayload.py
>@@ -90,7 +90,7 @@ import itertools
> 
> from pykickstart.constants import KS_MISSING_IGNORE
> 
>-YUM_PLUGINS = ["blacklist", "whiteout", "fastestmirror", "langpacks"]
>+YUM_PLUGINS = ["fastestmirror", "langpacks"]
> 
> import inspect
> import threading
>diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum
>index da40fcc..12a562f 100755
>--- a/scripts/anaconda-yum
>+++ b/scripts/anaconda-yum
>@@ -27,7 +27,7 @@ import rpmUtils
> import yum
> from urlgrabber.grabber import URLGrabError
> 
>-YUM_PLUGINS = ["blacklist", "whiteout", "fastestmirror", "langpacks"]
>+YUM_PLUGINS = ["fastestmirror", "langpacks"]
> 
> def setup_parser():
>     """ Setup argparse with supported arguments

Actions: View | Diff

Attachments on bug 1040530: 835311