[PATCH 3/9] Actually remove askmethod and related code
Martin Kolman
mkolman at redhat.com
Mon Jun 9 16:26:00 UTC 2014
Even though it was already marked as removed in the documentation,
there still was some askmethod related code.
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
anaconda | 4 ----
pyanaconda/flags.py | 1 -
pyanaconda/packaging/yumpayload.py | 10 ++++------
pyanaconda/ui/gui/spokes/source.py | 5 -----
pyanaconda/ui/tui/spokes/source.py | 5 -----
5 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/anaconda b/anaconda
index 14890c6..1f51163 100755
--- a/anaconda
+++ b/anaconda
@@ -282,7 +282,6 @@ def parseArguments(argv=None, boot_cmdline=None):
ap.add_argument("--multilib", dest="multiLib", action="store_true", default=False)
ap.add_argument("-m", "--method", dest="method", default=None)
- ap.add_argument("--askmethod", dest="askmethod", action="store_true", default=False)
ap.add_argument("--repo", dest="method", default=None)
ap.add_argument("--stage2", dest="stage2", default=None)
ap.add_argument("--noverifyssl", action="store_true", default=False)
@@ -761,9 +760,6 @@ if __name__ == "__main__":
from pyanaconda.flags import flags, can_touch_runtime_system
(opts, depr) = parseArguments(boot_cmdline=flags.cmdline)
- if opts.askmethod:
- flags.askmethod = True
-
# Set up logging as early as possible.
import logging
from pyanaconda import anaconda_log
diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index 4613f48..1fe5ad8 100644
--- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py
@@ -60,7 +60,6 @@ class Flags(object):
self.imageInstall = False
self.automatedInstall = False
self.dirInstall = False
- self.askmethod = False
self.eject = True
self.extlinux = False
self.gpt = False
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 760fa02..92bd54a 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -498,12 +498,10 @@ reposdir=%s
# This needs to be done again, reset tore it down.
url, mirrorlist, sslverify = self._setupInstallDevice(self.storage, checkmount)
- # If this is a kickstart install and no method has been set up, or
- # askmethod was given on the command line, we don't want to do
- # anything. Just disable all repos and return. This should avoid
- # metadata fetching.
- if (not method.method and flags.automatedInstall) or \
- flags.askmethod:
+ # If this is a kickstart install and no method has been set up
+ # we don't want to do anything. Just disable all repos and return.
+ # This should avoid metadata fetching.
+ if (not method.method and flags.automatedInstall):
with _yum_lock:
for repo in self._yum.repos.repos.values():
self.disableRepo(repo.id)
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index f2e4d07..3769172 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -363,11 +363,6 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler):
self._cdrom = None
def apply(self):
- # If askmethod was provided on the command line, entering the source
- # spoke wipes that out.
- if flags.askmethod:
- flags.askmethod = False
-
threadMgr.add(AnacondaThread(name=constants.THREAD_PAYLOAD_MD, target=self.getRepoMetadata))
self.clear_info()
diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py
index 90a8cfc..94dfb8a 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -248,11 +248,6 @@ class SourceSpoke(EditTUISpoke, SourceSwitchHandler):
def apply(self):
""" Execute the selections made. """
- # If askmethod was provided on the command line, entering the source
- # spoke wipes that out.
- if flags.askmethod:
- flags.askmethod = False
-
threadMgr.add(AnacondaThread(name=THREAD_PAYLOAD_MD,
target=self.getRepoMetadata))
--
1.9.3
More information about the anaconda-patches
mailing list