diff options
author | Chris Lumens <clumens@redhat.com> | 2013-02-12 10:50:54 -0500 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2013-02-13 10:41:16 -0500 |
commit | 3b13641079a0801c3d7eeb6b8462b7f5ccbd611b (patch) | |
tree | b2e38325a1625b7bfe13c8b609336ef8b9e43a15 /pyanaconda/packaging | |
parent | b59ad380f3037971202c4a9bd90e40ec0c781d44 (diff) | |
download | anaconda-3b13641079a0801c3d7eeb6b8462b7f5ccbd611b.tar.gz anaconda-3b13641079a0801c3d7eeb6b8462b7f5ccbd611b.tar.xz anaconda-3b13641079a0801c3d7eeb6b8462b7f5ccbd611b.zip |
Restore support for partial kickstart files (#887254).
Diffstat (limited to 'pyanaconda/packaging')
-rw-r--r-- | pyanaconda/packaging/yumpayload.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 6ca2f3b3f..1f1017601 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -415,10 +415,12 @@ reposdir=%s # start with a fresh YumBase instance self.reset(root=root) - # If askmethod was given on the command line, we don't want to do + # 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 flags.askmethod: + if (not self.data.method.method and flags.automatedInstall) or \ + flags.askmethod: with _yum_lock: for repo in self._yum.repos.repos.values(): self.disableRepo(repo.id) |