revisor/base.py | 6 +--
revisor/cfg.py | 100 +++++++++++++++++++++++++++++++++++++++++++---------
revisor/progress.py | 2 -
revisor/pungi.py | 8 ++--
4 files changed, 92 insertions(+), 24 deletions(-)
New commits:
commit d147743612ee998603391864c0b5641be82a416c
Merge: 56984a2... 7235929...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 1 17:54:20 2008 +0100
Merge branch 'master' of
ssh://git.fedorahosted.org/git/revisor
commit 56984a2c7b4f175ca5506c800955967066291a02
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Dec 1 17:52:43 2008 +0100
Fix F10 missing in a lot of conditionals
diff --git a/revisor/base.py b/revisor/base.py
index ca23ac1..1ba89df 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -1090,13 +1090,13 @@ class RevisorBase:
# against the external repositories used to compose the tree, rather then
# the tree itself
- if self.cfg.version_from in [ "F9", "DEVEL" ] and mode ==
"installation":
+ if self.cfg.version_from in [ "F9", "F10", "DEVEL"
] and mode == "installation":
packages_to_add = []
required_pkgs = ['kernel']
if self.cfg.architecture not in [ "ppc", "ppc64" ]:
required_pkgs.extend(['grub'])
- if self.cfg.version_from not in [ "DEVEL" ]:
+ if self.cfg.version_from not in [ "F10", "DEVEL" ]:
required_pkgs.extend(['kernel-xen'])
suggested_pkgs = []
@@ -1621,7 +1621,7 @@ class RevisorBase:
"java-development",
"kde-software-development",
"mail-server", "network-server",
"legacy-network-server"])
- elif self.cfg.version_from in [ "F8", "F9" ]:
+ elif self.cfg.version_from in [ "F8", "F9",
"F10" ]:
# Here is where we add groups
groups_nondefault = []
groups_nondefault_support = []
diff --git a/revisor/cfg.py b/revisor/cfg.py
index 369f156..b3d4d89 100644
--- a/revisor/cfg.py
+++ b/revisor/cfg.py
@@ -1189,8 +1189,10 @@ class Runtime:
"7" : "F7",
"8" : "F8",
"9" : "F9",
+ "10" : "F10",
"5" : "RHEL5"
}
+
# Repo store for dialog population
self.repos = {}
@@ -1449,22 +1451,8 @@ class Runtime:
'zlib'
],
"DEVEL": [
- 'busybox-anaconda',
- 'device-mapper-libs',
- 'gfs2-utils',
- 'iscsi-initiator-utils',
- 'jfsutils',
- 'keyutils-libs',
- 'libuser-python',
- 'newt-python',
- 'ntfs-3g',
- 'rpcbind',
- 'reiserfs-utils',
- 'udev-static',
- 'xfsdump',
- 'xfsprogs',
- 'yum-fedorakmod',
- 'yum-metadata-parser'
+ ],
+ "F10": [
],
"F9": [
],
@@ -1611,6 +1599,10 @@ class Runtime:
"DEVEL": [
'upstart',
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
'sysvinit',
],
@@ -1626,6 +1618,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1638,6 +1634,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1650,6 +1650,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1662,6 +1666,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1678,6 +1686,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1690,6 +1702,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1702,6 +1718,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1714,6 +1734,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1726,6 +1750,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1740,6 +1768,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1752,6 +1784,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1764,6 +1800,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1776,6 +1816,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1788,6 +1832,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1803,6 +1851,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1815,6 +1867,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1827,6 +1883,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1839,6 +1899,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
@@ -1851,6 +1915,10 @@ class Runtime:
],
"DEVEL": [
],
+ "F10": [
+ ],
+ "F9": [
+ ],
"F8": [
],
"F7": [
diff --git a/revisor/progress.py b/revisor/progress.py
index deb2785..e2f0767 100644
--- a/revisor/progress.py
+++ b/revisor/progress.py
@@ -524,7 +524,7 @@ class PungiCallback:
self.buildinstall_total = 500.0
elif self.cfg.version_from == "F8":
self.buildinstall_total = 9000.0
- elif self.cfg.version_from in [ "F9", "DEVEL" ]:
+ elif self.cfg.version_from in [ "F9", "F10",
"DEVEL" ]:
self.buildinstall_total = 59000.0
else:
self.buildinstall_total = 59000.0
diff --git a/revisor/pungi.py b/revisor/pungi.py
index 4d77e36..6528ba1 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -268,7 +268,7 @@ cost=500
#buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in
buildinstall
# FIXME: Determine options from the anaconda-runtime version
- if self.cfg.version_from in [ "F9", "DEVEL" ]:
+ if self.cfg.version_from in [ "F9", "F10", "DEVEL"
]:
buildinstall.append('--debug')
if self.cfg.version_from in [ "RHEL5" ]:
@@ -289,7 +289,7 @@ cost=500
buildinstall.append('"%s %s"' % (self.cfg.product_name,
self.cfg.version))
# FIXME: Everything < F9 needs --prodpath
- if not self.cfg.version_from in [ "F9", "DEVEL" ]:
+ if not self.cfg.version_from in [ "F9", "F10",
"DEVEL" ]:
buildinstall.append('--prodpath')
buildinstall.append(self.cfg.product_path)
@@ -305,14 +305,14 @@ cost=500
buildinstall.append('--bugurl')
buildinstall.append('%s' % self.cfg.bugurl)
- if self.cfg.version_from in [ "F9", "DEVEL"]:
+ if self.cfg.version_from in [ "F9", "F10",
"DEVEL"]:
(repository_baseurls,repository_mirrorlists) =
revisor.misc.get_repourls(self.cfg.yumobj)
for mlist in repository_mirrorlists:
buildinstall.extend(['--mirrorlist', '%s' % mlist])
buildinstall.append(self.topdir)
- if self.cfg.version_from in [ "F9", "DEVEL"]:
+ if self.cfg.version_from in [ "F9", "F10",
"DEVEL"]:
for burl in repository_baseurls:
buildinstall.append('%s' % burl)