diff options
author | Chris Lumens <clumens@redhat.com> | 2008-06-06 13:07:48 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2008-06-18 10:44:56 -0400 |
commit | aa169c3ad927f909f8747582585f903635ec2e13 (patch) | |
tree | 6d604a28ab6f6aa309794e7235b90c4f713bf4ec /yuminstall.py | |
parent | 0d6b77b3fa285b4a1eecc5ad965c8cfcd2de0303 (diff) | |
download | anaconda-aa169c3ad927f909f8747582585f903635ec2e13.tar.gz anaconda-aa169c3ad927f909f8747582585f903635ec2e13.tar.xz anaconda-aa169c3ad927f909f8747582585f903635ec2e13.zip |
Substitute the version from buildstamp for $releasever if needed.
Diffstat (limited to 'yuminstall.py')
-rw-r--r-- | yuminstall.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/yuminstall.py b/yuminstall.py index 7ab9bb49a..ee4725331 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -41,7 +41,7 @@ from yum.constants import * from yum.Errors import RepoError, YumBaseError, PackageSackError from yum.yumRepo import YumRepository from backend import AnacondaBackend -from product import productName, productStamp +from product import * from sortedtransaction import SplitMediaTransactionData from constants import * from image import * @@ -553,12 +553,12 @@ class AnacondaYum(YumSorter): from ConfigParser import ConfigParser c = ConfigParser() - if os.access("%s/.treeinfo" % self.methodstr, os.R_OK): - ConfigParser.read(c, "%s/.treeinfo" % self.methodstr) + if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): + ConfigParser.read(c, "%s/.treeinfo" % self.anaconda.methodstr) else: ug = URLGrabber() - ug.urlgrab("%s/.treeinfo" % self.methodstr, "/tmp/.treeinfo", - copy_local=1) + ug.urlgrab("%s/.treeinfo" % self.anaconda.methodstr, + "/tmp/.treeinfo", copy_local=1) ConfigParser.read(c, "/tmp/.treeinfo") return c.get("general", "version") @@ -566,8 +566,7 @@ class AnacondaYum(YumSorter): try: self.yumvar["releasever"] = _getReleasever() except: - log.error("Unable to get .treeinfo file, $releasever substitution " - "will be unavailable.") + self.yumvar["releasever"] = productVersion YumSorter.getReposFromConfig(self) |