diff options
Diffstat (limited to 'yuminstall.py')
| -rw-r--r-- | yuminstall.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/yuminstall.py b/yuminstall.py index 48ad201a9..05f708177 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -202,7 +202,7 @@ class AnacondaYum(yum.YumBase): return (downloadpkgs, totalSize, totalFiles) def run(self, instLog, cb): - self.initActionTs(macros=self.macros) + self.initActionTs() self.populateTs(keepold=0) self.ts.check() self.ts.order() @@ -215,7 +215,10 @@ class AnacondaYum(yum.YumBase): def setup(self, fn="/etc/yum.conf", root="/"): self.doConfigSetup(fn, root) - self.doTsSetup(macros=self.macros) + for (key, val) in self.macros.items(): + rpm.addMacro(key, val) + + self.doTsSetup() self.doRpmDBSetup() # XXX: handle RepoError self.doRepoSetup() @@ -364,6 +367,10 @@ class YumBackend(AnacondaBackend): if flags.test: return + if not id.upgrade(): + rpm.addMacro("__dbi_htconfig", + "hash nofsync %{__dbi_other} %{__dbi_perms}") + pkgTimer = timer.Timer(start = 0) id.instProgress.setSizes(len(self.dlpkgs), self.totalSize, self.totalFiles) |