Remove the hardcoded BETANAG constant and use
the productIsFinal variable instead.
---
constants.py | 2 --
installclass.py | 2 +-
yuminstall.py | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/constants.py b/constants.py
index e6283b8..7455322 100644
--- a/constants.py
+++ b/constants.py
@@ -24,8 +24,6 @@ import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
N_ = lambda x: x
-BETANAG = 0
-
SELINUX_DEFAULT = 1
DISPATCH_BACK = -1
diff --git a/installclass.py b/installclass.py
index ad12971..a417762 100644
--- a/installclass.py
+++ b/installclass.py
@@ -126,7 +126,7 @@ class BaseInstallClass(object):
"complete"
)
- if not BETANAG:
+ if productIsFinal:
dispatch.skipStep("betanag", permanent=1)
if not iutil.isX86():
diff --git a/yuminstall.py b/yuminstall.py
index f61ccb6..890ed83 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -593,12 +593,12 @@ class AnacondaYum(YumSorter):
raise RepoError, "Repo %s contains -source or -debuginfo, excluding" % name
# this is a little hard-coded, but it's effective
- if not BETANAG and ("rawhide" in repo.id or "development" in repo.id):
+ if productIsFinal and ("rawhide" in repo.id or "development" in repo.id):
name = repo.name
del(repo)
raise RepoError, "Excluding devel repo %s for non-devel anaconda" % name
- if BETANAG and not repo.enabled:
+ if not productIsFinal and not repo.enabled:
name = repo.name
del(repo)
raise RepoError, "Excluding disabled repo %s for prerelease" % name
--
1.7.5.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
